Fix font ID allocation from DCP when there are subs and ccaps using the same IDs...

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 0ce87ed9be0a192ec6923036f724b9d33abe7cd0..540abdd8acf4f863d48ff81e15dd969fdc3e349b 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -203,6 +203,8 @@ public:
                return true;
        }
 
                return true;
        }
 

+       bool has_mapped_audio() const;
+

        /* ChangeType::PENDING and ChangeType::CANCELLED may be emitted from any thread; ChangeType::DONE always from GUI thread */
        boost::signals2::signal<void (ChangeType, std::weak_ptr<Content>, int, bool)> Change;
 
        /* ChangeType::PENDING and ChangeType::CANCELLED may be emitted from any thread; ChangeType::DONE always from GUI thread */
        boost::signals2::signal<void (ChangeType, std::weak_ptr<Content>, int, bool)> Change;
 


@@ -234,7 +236,7 @@ private:
        friend struct best_dcp_frame_rate_test_double;
        friend struct audio_sampling_rate_test;
        friend struct subtitle_font_id_change_test2;
        friend struct best_dcp_frame_rate_test_double;
        friend struct audio_sampling_rate_test;
        friend struct subtitle_font_id_change_test2;

-       template<class, class> friend class ChangeSignaller;
+       template<class, class> friend class ChangeSignalDespatcher;

 
        void signal_change (ChangeType, int);
 
 
        void signal_change (ChangeType, int);
 


@@ -256,6 +258,7 @@ private:
 
 
 typedef ChangeSignaller<Content, int> ContentChangeSignaller;
 
 
 typedef ChangeSignaller<Content, int> ContentChangeSignaller;

+typedef ChangeSignalDespatcher<Content, int> ContentChangeSignalDespatcher;

 
 
 #endif
 
 
 #endif