From 68d175e786962a7c6f8a2f550e0fcedd2fa0a106 Mon Sep 17 00:00:00 2001
From: lvw <lvw@e10066b5-e1e2-0310-b819-94efdf66514b>
Date: Mon, 4 Oct 2004 20:47:58 +0000
Subject: 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
---
 muggle-plugin/vdr_decoder.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'muggle-plugin/vdr_decoder.c')

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 ) ) 
     {
-- 
cgit v1.2.3