diff options
| author | lvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b> | 2004-10-04 20:47:58 +0000 |
|---|---|---|
| committer | lvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b> | 2004-10-04 20:47:58 +0000 |
| commit | 68d175e786962a7c6f8a2f550e0fcedd2fa0a106 (patch) | |
| tree | 168a234ea5fe9477c8352aed57915c2e764decb1 /muggle-plugin/vdr_decoder.c | |
| parent | ac0b4a4ad469f9689a4f83f1e3b9ebc823ba4703 (diff) | |
| download | vdr-plugin-muggle-68d175e786962a7c6f8a2f550e0fcedd2fa0a106.tar.gz vdr-plugin-muggle-68d175e786962a7c6f8a2f550e0fcedd2fa0a106.tar.bz2 | |
Added a patch to correct minor errors. Further, remove using namespace directives in order to remain compatible with g++ 2.95.4
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@200 e10066b5-e1e2-0310-b819-94efdf66514b
Diffstat (limited to 'muggle-plugin/vdr_decoder.c')
| -rw-r--r-- | muggle-plugin/vdr_decoder.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/muggle-plugin/vdr_decoder.c b/muggle-plugin/vdr_decoder.c index 1c0b154..0384031 100644 --- a/muggle-plugin/vdr_decoder.c +++ b/muggle-plugin/vdr_decoder.c @@ -21,20 +21,18 @@ #include <sys/stat.h> #include <sys/vfs.h> -#include <videodir.h> -#include <interface.h> - #include "vdr_decoder.h" #include "vdr_decoder_mp3.h" #include "vdr_decoder_ogg.h" #include "mg_content_interface.h" -using namespace std; +#include <videodir.h> +#include <interface.h> // --- mgDecoders --------------------------------------------------------------- -mgMediaType mgDecoders::getMediaType( string s ) +mgMediaType mgDecoders::getMediaType( std::string s ) { mgMediaType mt = MT_UNKNOWN; @@ -62,7 +60,7 @@ mgDecoder *mgDecoders::findDecoder( mgContentItem *item ) { mgDecoder *decoder = 0; - string filename = item->getSourceFile(); + std::string filename = item->getSourceFile(); switch( getMediaType( filename ) ) { |