X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=acc77a814920630582c74678aee72c12ef858c13;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=583a92636443ba7cd1bd650eb3cf61144017394c;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 583a92636..acc77a814 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington 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 @@ -24,11 +24,11 @@ #ifndef DCPOMATIC_DECODER_H #define DCPOMATIC_DECODER_H +#include "types.h" +#include "dcpomatic_time.h" #include #include #include -#include "types.h" -#include "dcpomatic_time.h" class Decoded; @@ -41,6 +41,8 @@ public: virtual ~Decoder () {} protected: + friend class AudioDecoderStream; + /** Seek so that the next pass() will yield the next thing * (video/sound frame, subtitle etc.) at or after the requested * time. Pass accurate = true to try harder to ensure that, at worst, @@ -50,7 +52,14 @@ protected: * it may seek to just the right spot. */ virtual void seek (ContentTime time, bool accurate) = 0; - virtual bool pass () = 0; + + enum PassReason { + PASS_REASON_VIDEO, + PASS_REASON_AUDIO, + PASS_REASON_SUBTITLE + }; + + virtual bool pass (PassReason reason) = 0; }; #endif