Do audio/video pts sync in a hopefully much more sensible way.

[dcpomatic.git] / src / lib / film_state.cc

diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc
index d59d7ce7b3627e68774fe0a7c43464bfdd62cc8a..283830f59703b39b287feb843f1f4c12ad53040b 100644 (file)
--- a/src/lib/film_state.cc
+++ b/src/lib/film_state.cc
@@ -126,7 +126,6 @@ FilmState::write_metadata () const
        }
 
        f << "frames_per_second " << _frames_per_second << "\n";
-       f << "audio_to_discard " << _audio_to_discard << "\n";
        
        _dirty = false;
 }
@@ -231,8 +230,6 @@ FilmState::read_metadata ()
                        _subtitle_streams.push_back (SubtitleStream (v));
                } else if (k == "frames_per_second") {
                        _frames_per_second = atof (v.c_str ());
-               } else if (k == "audio_to_discard") {
-                       _audio_to_discard = atoi (v.c_str ());
                }
        }
                
@@ -812,13 +809,6 @@ FilmState::set_frames_per_second (float f)
        _frames_per_second = f;
        signal_changed (FRAMES_PER_SECOND);
 }
-
-void
-FilmState::set_audio_to_discard (int a)
-{
-       _audio_to_discard = a;
-       signal_changed (AUDIO_TO_DISCARD);
-}
        
 void
 FilmState::signal_changed (Property p)
@@ -842,9 +832,3 @@ FilmState::audio_channels () const
 
        return _audio_streams[_audio_stream].channels ();
 }
-
-int
-FilmState::total_audio_delay () const
-{
-       return _audio_delay - _audio_to_discard;
-}