diff options
| -rw-r--r-- | dxr3audiodecoder.c | 8 | ||||
| -rw-r--r-- | dxr3device.c | 2 | ||||
| -rw-r--r-- | dxr3device.h | 2 | ||||
| -rw-r--r-- | dxr3ffmpeg.c | 8 | ||||
| -rw-r--r-- | dxr3ffmpeg.h | 10 | ||||
| -rw-r--r-- | dxr3interface.c | 2 | ||||
| -rw-r--r-- | dxr3interface.h | 2 |
7 files changed, 17 insertions, 17 deletions
diff --git a/dxr3audiodecoder.c b/dxr3audiodecoder.c index 1fd149c..53faca0 100644 --- a/dxr3audiodecoder.c +++ b/dxr3audiodecoder.c @@ -53,7 +53,7 @@ cDxr3AudioDecoder::cDxr3AudioDecoder() : rbuf(50000), ac3dtsDecoder(&rbuf) cDxr3AudioDecoder::~cDxr3AudioDecoder() { // close codec, if it is open - cDxr3Ffmepg::Instance().CloseCodec(Codec); + cDxr3Ffmpeg::Instance().CloseCodec(Codec); } // ================================== @@ -61,10 +61,10 @@ cDxr3AudioDecoder::~cDxr3AudioDecoder() void cDxr3AudioDecoder::Init() { // (re)init codec - cDxr3Ffmepg::Instance().CloseCodec(Codec); - if (cDxr3Ffmepg::Instance().FindCodec(Codec)) + cDxr3Ffmpeg::Instance().CloseCodec(Codec); + if (cDxr3Ffmpeg::Instance().FindCodec(Codec)) { - cDxr3Ffmepg::Instance().OpenCodec(Codec); + cDxr3Ffmpeg::Instance().OpenCodec(Codec); rate = channels = -1; frameSize = Codec.codec_context.frame_size; decoderOpened = true; diff --git a/dxr3device.c b/dxr3device.c index daacdc3..45fee41 100644 --- a/dxr3device.c +++ b/dxr3device.c @@ -325,7 +325,7 @@ int cDxr3Device::PlayAudio(const uchar *Data, int Length, uchar Id) return origLength; } -// addition functions +// additional functions // ================================== void cDxr3Device::SetVideoFormat(bool VideoFormat16_9) diff --git a/dxr3device.h b/dxr3device.h index 8edc934..29f41b7 100644 --- a/dxr3device.h +++ b/dxr3device.h @@ -58,7 +58,7 @@ public: virtual int PlayVideo(const uchar *Data, int Length); virtual int PlayAudio(const uchar *Data, int Length, uchar Id); - // addition functions + // additional functions virtual void SetVideoFormat(bool VideoFormat16_9); virtual void SetVolumeDevice(int Volume); virtual void SetAudioChannelDevice(int AudioChannel); diff --git a/dxr3ffmpeg.c b/dxr3ffmpeg.c index fcb6e2d..ce96126 100644 --- a/dxr3ffmpeg.c +++ b/dxr3ffmpeg.c @@ -25,7 +25,7 @@ // ================================== //! constructor -cDxr3Ffmepg::cDxr3Ffmepg() +cDxr3Ffmpeg::cDxr3Ffmpeg() { avcodec_init(); // Register only codec(s) we'll need. @@ -34,7 +34,7 @@ cDxr3Ffmepg::cDxr3Ffmepg() // ================================== //! look if Codec is supported by ffmpeg -bool cDxr3Ffmepg::FindCodec(struct Dxr3Codec& Codec) +bool cDxr3Ffmpeg::FindCodec(struct Dxr3Codec& Codec) { // find codec Codec.codec = avcodec_find_decoder(Codec.id); @@ -54,7 +54,7 @@ bool cDxr3Ffmepg::FindCodec(struct Dxr3Codec& Codec) // ================================== //! try to open Codec -bool cDxr3Ffmepg::OpenCodec(struct Dxr3Codec& Codec) +bool cDxr3Ffmpeg::OpenCodec(struct Dxr3Codec& Codec) { // try to open codec int result = avcodec_open(&Codec.codec_context, Codec.codec); @@ -74,7 +74,7 @@ bool cDxr3Ffmepg::OpenCodec(struct Dxr3Codec& Codec) // ================================== //! close codec -void cDxr3Ffmepg::CloseCodec(struct Dxr3Codec& Codec) +void cDxr3Ffmpeg::CloseCodec(struct Dxr3Codec& Codec) { if (Codec.Open) { diff --git a/dxr3ffmpeg.h b/dxr3ffmpeg.h index 98557c5..5b1824b 100644 --- a/dxr3ffmpeg.h +++ b/dxr3ffmpeg.h @@ -45,24 +45,24 @@ struct Dxr3Codec // ================================== // class to work with ffmpeg /*! - With cDxr3Ffmepg you can easily handle as many + With cDxr3Ffmpeg you can easily handle as many codecs as you want. At the moment we need this only for the audiodecoder, but in future i want to use it for ohter nice stuff :) */ -class cDxr3Ffmepg : public Singleton<cDxr3Ffmepg> +class cDxr3Ffmpeg : public Singleton<cDxr3Ffmpeg> { public: - cDxr3Ffmepg(); - ~cDxr3Ffmepg() {} + cDxr3Ffmpeg(); + ~cDxr3Ffmpeg() {} bool FindCodec(struct Dxr3Codec& Codec); bool OpenCodec(struct Dxr3Codec& Codec); void CloseCodec(struct Dxr3Codec& Codec); private: - cDxr3Ffmepg(cDxr3Ffmepg&); // no copy constructor + cDxr3Ffmpeg(cDxr3Ffmpeg&); // no copy constructor }; #endif /*_DXR3_FFMPEG_H_*/ diff --git a/dxr3interface.c b/dxr3interface.c index 9b5f6c6..07291a9 100644 --- a/dxr3interface.c +++ b/dxr3interface.c @@ -378,7 +378,7 @@ void cDxr3Interface::EnableOverlay() // ================================== //! disable overlay mode of the dxr3 -void cDxr3Interface::DisanleOverlay() +void cDxr3Interface::DisableOverlay() { // is it already disabled if (!m_OverlayActive) diff --git a/dxr3interface.h b/dxr3interface.h index b0e9f2c..dfac31d 100644 --- a/dxr3interface.h +++ b/dxr3interface.h @@ -97,7 +97,7 @@ public: } void DisableAudio(); void EnableOverlay(); - void DisanleOverlay(); + void DisableOverlay(); // set/get functions uint32_t GetAspectRatio() const; |