From 653ca204d10b3481670a80769baa3d768bb5f64a Mon Sep 17 00:00:00 2001 From: lvw Date: Tue, 7 Sep 2004 17:40:47 +0000 Subject: Merged ogg vorbis player to trunk git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@148 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_decoder_ogg.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 vdr_decoder_ogg.h (limited to 'vdr_decoder_ogg.h') diff --git a/vdr_decoder_ogg.h b/vdr_decoder_ogg.h new file mode 100644 index 0000000..b6bfc17 --- /dev/null +++ b/vdr_decoder_ogg.h @@ -0,0 +1,60 @@ +/*! \file vdr_decoder_ogg.h + * \ingroup vdr + * + * The file contains a decoder which is used by the player to decode ogg vorbis audio files. + * + * Adapted from + * MP3/MPlayer plugin to VDR (C++) + * (C) 2001-2003 Stefan Huelswitt + */ + +#ifndef ___DECODER_OGG_H +#define ___DECODER_OGG_H + +#define DEC_OGG DEC_ID('O','G','G',' ') +#define DEC_OGG_STR "OGG" + +#ifdef HAVE_VORBISFILE + +#include "vdr_decoder.h" + +// ---------------------------------------------------------------- + +class mgOggFile; + +class mgOggDecoder : public mgDecoder +{ + private: + + mgOggFile *m_file; + struct mgDecode m_ds; + struct mad_pcm *m_pcm; + unsigned long long m_index; + + // + void init(void); + bool clean(void); + struct mgDecode *done( eDecodeStatus status ); + + public: + + mgOggDecoder( mgContentItem *item ); + ~mgOggDecoder(); + + virtual mgPlayInfo *playInfo(); + + virtual bool valid(); + + virtual bool start(); + + virtual bool stop(); + + virtual bool skip(int Seconds, int Avail, int Rate); + + virtual struct mgDecode *decode(void); +}; + +// ---------------------------------------------------------------- + +#endif //HAVE_VORBISFILE +#endif //___DECODER_OGG_H -- cgit v1.2.3 From dc4959dfdf918f6cd7b448cd2102a97e29c82af7 Mon Sep 17 00:00:00 2001 From: lvw Date: Fri, 17 Sep 2004 15:46:24 +0000 Subject: Decoder documentation added. git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@170 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_decoder_ogg.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vdr_decoder_ogg.h') diff --git a/vdr_decoder_ogg.h b/vdr_decoder_ogg.h index b6bfc17..d249ab2 100644 --- a/vdr_decoder_ogg.h +++ b/vdr_decoder_ogg.h @@ -22,6 +22,10 @@ class mgOggFile; +/*! + * \brief A decoder for Ogg Vorbis files + * + */ class mgOggDecoder : public mgDecoder { private: -- cgit v1.2.3 From 0756ae40d68d403082c86adef042a4c0daba219f Mon Sep 17 00:00:00 2001 From: LarsAC Date: Fri, 7 Jan 2005 18:43:03 +0000 Subject: Merged branch osd_extensions back to main trunk git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@324 e10066b5-e1e2-0310-b819-94efdf66514b --- vdr_decoder_ogg.h | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) (limited to 'vdr_decoder_ogg.h') diff --git a/vdr_decoder_ogg.h b/vdr_decoder_ogg.h index d249ab2..1f5fcfc 100644 --- a/vdr_decoder_ogg.h +++ b/vdr_decoder_ogg.h @@ -1,9 +1,9 @@ /*! \file vdr_decoder_ogg.h * \ingroup vdr - * + * * The file contains a decoder which is used by the player to decode ogg vorbis audio files. * - * Adapted from + * Adapted from * MP3/MPlayer plugin to VDR (C++) * (C) 2001-2003 Stefan Huelswitt */ @@ -22,43 +22,42 @@ class mgOggFile; -/*! +/*! * \brief A decoder for Ogg Vorbis files * */ -class mgOggDecoder : public mgDecoder +class mgOggDecoder:public mgDecoder { - private: + private: - mgOggFile *m_file; - struct mgDecode m_ds; - struct mad_pcm *m_pcm; - unsigned long long m_index; + mgOggFile * m_file; + struct mgDecode m_ds; + struct mad_pcm *m_pcm; + unsigned long long m_index; - // - void init(void); - bool clean(void); - struct mgDecode *done( eDecodeStatus status ); +// + void init (void); + bool clean (void); + struct mgDecode *done (eDecodeStatus status); - public: + public: - mgOggDecoder( mgContentItem *item ); - ~mgOggDecoder(); + mgOggDecoder (mgContentItem * item); + ~mgOggDecoder (); - virtual mgPlayInfo *playInfo(); + virtual mgPlayInfo *playInfo (); - virtual bool valid(); + virtual bool valid (); - virtual bool start(); + virtual bool start (); - virtual bool stop(); + virtual bool stop (); - virtual bool skip(int Seconds, int Avail, int Rate); + virtual bool skip (int Seconds, int Avail, int Rate); - virtual struct mgDecode *decode(void); + virtual struct mgDecode *decode (void); }; // ---------------------------------------------------------------- - -#endif //HAVE_VORBISFILE -#endif //___DECODER_OGG_H +#endif //HAVE_VORBISFILE +#endif //___DECODER_OGG_H -- cgit v1.2.3