Compilation errors removed

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/branches/ogg_player@140 e10066b5-e1e2-0310-b819-94efdf66514b

7 files changed, 25 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 870bd6e..47067cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile,v 1.10 2004/08/29 14:39:33 lvw Exp $
+# $Id$
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -21,7 +21,7 @@ CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-deprecated -g
 ### The directory environment:
 
 DVBDIR = ../../../../DVB
-VDRDIR = ../../..
+VDRDIR = /usr/local/src/VDR
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
@@ -47,7 +47,7 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 MIFLAGS += -I/usr/include/taglib -ltag -lmysqlclient
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o i18n.o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o mg_playlist.o vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o vdr_setup.o
+OBJS = $(PLUGIN).o i18n.o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o mg_playlist.o vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o vdr_setup.o vdr_decoder_ogg.o
 
 LIBS = -lmad -lmysqlclient
 
diff --git a/gd_content_interface.h b/gd_content_interface.h
index 83d6bdd..d810fa5 100644
--- a/gd_content_interface.h
+++ b/gd_content_interface.h
@@ -227,7 +227,7 @@ class mgGdTrack : public mgContentItem
 
   /*! \brief obtain the bitrate of the track
    */
-  virtual string getBitrate();
+  virtual std::string getBitrate();
 
   /*!
    * \brief obtain the complete track information
@@ -330,6 +330,11 @@ private:
   std::string m_genre; 
   
   /*!
+   * \brief The bitrate of the music
+   */
+  std::string m_bitrate; 
+
+  /*!
    * \brief The year in which the track appeared
    */
   int m_year; 
diff --git a/mg_content_interface.h b/mg_content_interface.h
index 87c5800..44658e8 100755
--- a/mg_content_interface.h
+++ b/mg_content_interface.h
@@ -177,7 +177,7 @@ class mgContentItem
 
   /*! \brief obtain the bitrate of the track
    */
-  virtual string getBitrate()
+  virtual std::string getBitrate()
     {
       return "";
     }
diff --git a/vdr_decoder.c b/vdr_decoder.c
index 8c89fda..c29d2c5 100644
--- a/vdr_decoder.c
+++ b/vdr_decoder.c
@@ -1,6 +1,7 @@
 /*!
  * \file vdr_decoder.h
  * \brief A generic decoder for a VDR media plugin (muggle)
+ * \ingroup vdr
  *
  * \version $Revision: 1.2 $
  * \date    $Date$
@@ -26,6 +27,8 @@
 #include "vdr_decoder.h"
 #include "vdr_decoder_mp3.h"
 
+#include "mg_content_interface.h"
+
 using namespace std;
 
 // --- mgDecoders ---------------------------------------------------------------
@@ -33,9 +36,10 @@ using namespace std;
 mgMediaType mgDecoders::getMediaType( string s )
 {
   // TODO: currently handles only mp3. LVW
-  char *p = s.c_str() + strlen( filename.c_str() ) - 1; 
+  char *f = (char *)s.c_str();
+  char *p = f + strlen( f ) - 1; // point to the end
 
-  while( p >= filename && *p != '.') --p; 
+  while( p >= f && *p != '.') --p; 
 
   if( !strcmp( p, ".mp3" ) )
     {
diff --git a/vdr_decoder.h b/vdr_decoder.h
index 0c3b145..ecc9a20 100644
--- a/vdr_decoder.h
+++ b/vdr_decoder.h
@@ -1,6 +1,7 @@
 /*!
  * \file vdr_decoder.h
  * \brief A generic decoder for a VDR media plugin (muggle)
+ * \ingroup vdr
  *
  * \version $Revision: 1.2 $
  * \date    $Date$
@@ -30,6 +31,7 @@ class mgContentItem;
 
 /*! 
  * \brief The current status of the decoder
+ * \ingroup vdr
  */
 enum eDecodeStatus
   { 
@@ -40,6 +42,7 @@ enum eDecodeStatus
 
 /*! 
  * \brief A data structure to put decoded PCM data
+ * \ingroup vdr
  */
 struct mgDecode
 {
@@ -52,6 +55,7 @@ struct mgDecode
 
 /*! 
  * \brief Information about ???
+ * \ingroup vdr
  */
 class mgPlayInfo
 {
@@ -63,6 +67,7 @@ public:
 
 /*! 
  * \brief Media types
+ * \ingroup vdr
  */
 enum mgMediaType
 {
@@ -71,6 +76,7 @@ enum mgMediaType
 
 /*! 
  * \brief A generic decoder class to handle conversion into PCM format
+ * \ingroup vdr
  */
 class mgDecoder
 {
@@ -154,7 +160,7 @@ public:
   
   /*! \brief Try to find a valid decoder for a file 
    */
-  static mgDecoder *findDecoder( std::string filename );
+  static mgDecoder *findDecoder( mgContentItem *item );
 
   /*! \brief determine the media type for a given source
    */
diff --git a/vdr_decoder_mp3.c b/vdr_decoder_mp3.c
index e0b3ba1..20fca5e 100644
--- a/vdr_decoder_mp3.c
+++ b/vdr_decoder_mp3.c
@@ -27,6 +27,7 @@
 #include "vdr_decoder_mp3.h"
 #include "vdr_stream.h"
 
+#include "mg_content_interface.h"
 #include "mg_tools.h"
 
 #define d(x) x
diff --git a/vdr_decoder_mp3.h b/vdr_decoder_mp3.h
index a0e142f..f9f3bde 100644
--- a/vdr_decoder_mp3.h
+++ b/vdr_decoder_mp3.h
@@ -30,6 +30,7 @@
 #endif
 
 class mgStream;
+class mgContentItem;
 
 // ----------------------------------------------------------------