From b92d19d8d78573cfbe5c3c4cedf8c226be6efcf4 Mon Sep 17 00:00:00 2001 From: wr61 Date: Tue, 8 Feb 2005 22:51:17 +0000 Subject: make it compilable with 2.95 git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@464 e10066b5-e1e2-0310-b819-94efdf66514b --- muggle-plugin/Makefile | 2 +- muggle-plugin/mg_actions.c | 2 ++ muggle-plugin/mg_db.c | 3 ++- muggle-plugin/mg_db.h | 4 ---- muggle-plugin/mg_order.c | 12 ++++++++---- muggle-plugin/mg_order.h | 4 ---- muggle-plugin/mg_valmap.h | 2 ++ muggle-plugin/muggle.h | 3 +++ muggle-plugin/mugglei.c | 2 ++ muggle-plugin/vdr_decoder.c | 10 ++++++---- muggle-plugin/vdr_decoder_flac.c | 15 +++++++++------ muggle-plugin/vdr_menu.c | 4 ++-- 12 files changed, 37 insertions(+), 26 deletions(-) diff --git a/muggle-plugin/Makefile b/muggle-plugin/Makefile index 7b8ba41..19b9c80 100644 --- a/muggle-plugin/Makefile +++ b/muggle-plugin/Makefile @@ -53,7 +53,7 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ -I/usr/include/mysql/ -I/usr/include/taglib -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' MIFLAGS += -I/usr/include/taglib -lmysqlclient diff --git a/muggle-plugin/mg_actions.c b/muggle-plugin/mg_actions.c index 42337d9..ea35c32 100644 --- a/muggle-plugin/mg_actions.c +++ b/muggle-plugin/mg_actions.c @@ -9,6 +9,8 @@ * $Id: mg_actions.c 276 2004-12-25 15:52:35Z wr61 $ */ +#include + #include #include #include diff --git a/muggle-plugin/mg_db.c b/muggle-plugin/mg_db.c index dfc0843..d6cf8b3 100644 --- a/muggle-plugin/mg_db.c +++ b/muggle-plugin/mg_db.c @@ -9,6 +9,7 @@ * */ +#include #include "mg_db.h" #include "vdr_setup.h" #include "mg_tools.h" @@ -403,7 +404,7 @@ string mgSelection::exportM3U () mgContentItem& t = m_tracks[i]; fprintf (listfile, "#EXTINF:%d,%s\n", t.getDuration (), t.getTitle ().c_str ()); - fprintf (listfile, "#MUGGLE:%d\n", t.getId()); + fprintf (listfile, "#MUGGLE:%ld\n", t.getId()); fprintf (listfile, "%s\n", t.getSourceFile (false).c_str ()); } fclose (listfile); diff --git a/muggle-plugin/mg_db.h b/muggle-plugin/mg_db.h index 5ef26e2..c0daf7c 100644 --- a/muggle-plugin/mg_db.h +++ b/muggle-plugin/mg_db.h @@ -17,10 +17,6 @@ #include #include #include -#include -#include -#include -#include #include using namespace std; diff --git a/muggle-plugin/mg_order.c b/muggle-plugin/mg_order.c index 46d4d57..cc93141 100644 --- a/muggle-plugin/mg_order.c +++ b/muggle-plugin/mg_order.c @@ -1,6 +1,7 @@ #include "mg_order.h" #include "mg_tools.h" #include "i18n.h" +#include bool iskeyGenre(mgKeyTypes kt) @@ -28,7 +29,7 @@ sql_string (MYSQL *db, const string s) return ""; char *buf = (char *) malloc (s.size () * 2 + 1); mysql_real_escape_string (db, buf, s.c_str (), s.size ()); - string result = "'" + std::string (buf) + "'"; + string result = "'" + string (buf) + "'"; free (buf); return result; } @@ -866,8 +867,11 @@ mgReferences::mgReferences() bool mgReferences::Equal(unsigned int i,string table1, string table2) const { - return (((at(i).t1()==table1) && (at(i).t2()==table2)) - || ((at(i).t1()==table2) && (at(i).t2()==table1))); + const mgReference& r = operator[](i); + string s1 = r.t1(); + string s2 = r.t2(); + return ((s1==table1) && (s2==table2)) + || ((s1==table2) && (s2==table1)); } mgParts @@ -875,7 +879,7 @@ mgReferences::FindConnectionBetween(string table1, string table2) const { for (unsigned int i=0 ; i #include #include -#include -#include #include -#include - #include "mg_valmap.h" using namespace std; diff --git a/muggle-plugin/mg_valmap.h b/muggle-plugin/mg_valmap.h index a1da822..ca39139 100644 --- a/muggle-plugin/mg_valmap.h +++ b/muggle-plugin/mg_valmap.h @@ -1,5 +1,7 @@ #ifndef _MG_VALMAP_H #define _MG_VALMAP_H + +#include #include #include diff --git a/muggle-plugin/muggle.h b/muggle-plugin/muggle.h index 171cdb7..4a05aee 100644 --- a/muggle-plugin/muggle.h +++ b/muggle-plugin/muggle.h @@ -32,6 +32,9 @@ #ifndef _MUGGLE_H #define _MUGGLE_H #include +#include +#include +#include #include class mgMainMenu; diff --git a/muggle-plugin/mugglei.c b/muggle-plugin/mugglei.c index 9cf74b0..79c68f6 100755 --- a/muggle-plugin/mugglei.c +++ b/muggle-plugin/mugglei.c @@ -6,6 +6,8 @@ */ // #define VERBOSE + +#include #include #include diff --git a/muggle-plugin/vdr_decoder.c b/muggle-plugin/vdr_decoder.c index 93dc540..2ba1e5b 100644 --- a/muggle-plugin/vdr_decoder.c +++ b/muggle-plugin/vdr_decoder.c @@ -21,6 +21,12 @@ #include #include +#include "mg_db.h" + +#include +#include + + #include "vdr_setup.h" #include "vdr_decoder.h" #include "vdr_decoder_mp3.h" @@ -35,10 +41,6 @@ extern void showmessage(const char *); #include "vdr_decoder_flac.h" #endif -#include "mg_db.h" - -#include -#include // --- mgDecoders --------------------------------------------------------------- diff --git a/muggle-plugin/vdr_decoder_flac.c b/muggle-plugin/vdr_decoder_flac.c index f18ceab..76d15dd 100644 --- a/muggle-plugin/vdr_decoder_flac.c +++ b/muggle-plugin/vdr_decoder_flac.c @@ -11,17 +11,20 @@ #ifdef HAVE_FLAC #define DEBUG -#include "vdr_setup.h" -#include "vdr_decoder_flac.h" + +#include +#include +#include #include "mg_tools.h" #include "mg_db.h" +#include "vdr_setup.h" +#include "vdr_decoder_flac.h" + + #include -#include -#include -#include using namespace std; @@ -82,7 +85,7 @@ bool mgFlacDecoder::initialize() m_reservoir[0] = new FLAC__int32[MAX_RES_SIZE]; m_reservoir[1] = new FLAC__int32[MAX_RES_SIZE]; - FLAC::Decoder::File::State d = init(); // TODO: check this + /*FLAC::Decoder::File::State d =*/ init(); // TODO: check this process_until_end_of_metadata(); // basically just skip metadata diff --git a/muggle-plugin/vdr_menu.c b/muggle-plugin/vdr_menu.c index e7e107b..5d3d1cd 100644 --- a/muggle-plugin/vdr_menu.c +++ b/muggle-plugin/vdr_menu.c @@ -9,6 +9,8 @@ * $Id$ */ +#include + #include #include #include @@ -220,7 +222,6 @@ mgMenu::mgMenu () void mgMainMenu::DumpOrders(mgValmap& nv) { - map::iterator it; for (unsigned int idx=0;idx::iterator it; for (unsigned int idx=0;idx