Use generic_string() in a couple of places to avoid unwanted backslashes in filenames.

[dcpomatic.git] / src / lib / playlist.h

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 0baf667fc119a6b78d295c7ae3649917ea046337..0ad70b52421ece5984664373b62e0ccc52428cbd 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -63,15 +63,17 @@ public:
 
        int best_dcp_frame_rate () const;
        DCPTime video_end () const;
+       DCPTime subtitle_end () const;
        FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
 
-       void set_sequence_video (bool);
-       void maybe_sequence_video ();
+       void set_sequence (bool);
+       void maybe_sequence ();
 
        void repeat (ContentList, int);
 
-       /** Emitted when content has been added to or removed from the playlist */
+       /** Emitted when content has been added to or removed from the playlist; implies OrderChanged */
        mutable boost::signals2::signal<void ()> Changed;
+       mutable boost::signals2::signal<void ()> OrderChanged;
        /** Emitted when something about a piece of our content has changed;
         *  these emissions include when the position of the content changes.
         *  Third parameter is true if signals are currently being emitted frequently.
@@ -84,8 +86,8 @@ private:
 
        /** List of content.  Kept sorted in position order. */
        ContentList _content;
-       bool _sequence_video;
-       bool _sequencing_video;
+       bool _sequence;
+       bool _sequencing;
        std::list<boost::signals2::connection> _content_connections;
 };