X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=f26e2532a1006cbe9a2e5be5f64aadeec5b90712;hb=9e4c091e6ef0f79fab10664e95240de2f14e5702;hp=d9f104c7dec1a9c33cb29b0310ffc6c386367be4;hpb=f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index d9f104c7d..f26e2532a 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -35,7 +35,7 @@ class ServerDescription; class Scaler; class Filter; -class SoundProcessor; +class CinemaSoundProcessor; class DCPContentType; class Ratio; class Cinema; @@ -103,9 +103,9 @@ public: return _tms_password; } - /** @return The sound processor that we are using */ - SoundProcessor const * sound_processor () const { - return _sound_processor; + /** @return The cinema sound processor that we are using */ + CinemaSoundProcessor const * cinema_sound_processor () const { + return _cinema_sound_processor; } std::list > cinemas () const { @@ -371,7 +371,6 @@ private: Config (); boost::filesystem::path file (bool) const; void read (); - void read_old_metadata (); void write () const; /** number of threads to use for J2K encoding on the local machine */ @@ -394,8 +393,8 @@ private: std::string _tms_user; /** Password to log into the TMS with */ std::string _tms_password; - /** Our sound processor */ - SoundProcessor const * _sound_processor; + /** Our cinema sound processor */ + CinemaSoundProcessor const * _cinema_sound_processor; std::list _allowed_dcp_frame_rates; /** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */ bool _allow_any_dcp_frame_rate;