summaryrefslogtreecommitdiff
path: root/src/lib/matcher.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-07 10:20:51 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-07 10:20:51 +0100
commit213f1b6c74585a16ea48bdeb550dbc6d11bb0f74 (patch)
treefeb0daef138128f8f5f1a919a4134bba017f6381 /src/lib/matcher.h
parent4ff5c21a9c3c2ea8ab3a253ef5658e3ee91e0bea (diff)
Revert "Fix another bit of incorrect logic (this_is_first_audio was inverted). Also try to add _audio_starts_with_video mode to Matcher."
This reverts commit 4ff5c21a9c3c2ea8ab3a253ef5658e3ee91e0bea.
Diffstat (limited to 'src/lib/matcher.h')
-rw-r--r--src/lib/matcher.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/matcher.h b/src/lib/matcher.h
index aab6adad9..41aa373a4 100644
--- a/src/lib/matcher.h
+++ b/src/lib/matcher.h
@@ -25,9 +25,6 @@ class Matcher : public Processor, public TimedAudioSink, public TimedVideoSink,
{
public:
Matcher (boost::shared_ptr<Log> log, int sample_rate, float frames_per_second);
-
- void set_audio_starts_with_video (bool);
-
void process_video (boost::shared_ptr<const Image> i, bool, boost::shared_ptr<Subtitle> s, double);
void process_audio (boost::shared_ptr<const AudioBuffers>, double);
void process_end ();
@@ -58,12 +55,9 @@ private:
std::list<AudioRecord> _pending_audio;
boost::optional<double> _first_input;
- boost::optional<double> _first_video;
boost::shared_ptr<const Image> _last_image;
boost::shared_ptr<Subtitle> _last_subtitle;
bool _had_first_video;
bool _had_first_audio;
-
- bool _audio_starts_with_video;
};