merge from muggle-0.1.8-BETA

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@814 e10066b5-e1e2-0310-b819-94efdf66514b

6 files changed, 27 insertions, 15 deletions

diff --git a/HISTORY b/HISTORY
index cbfb927..5884f92 100644
--- a/HISTORY
+++ b/HISTORY
@@ -200,7 +200,7 @@ XXXXXXXXXX: Version 0.0.8-ALPHA
   first track restarted the first track. Now it goes to the last track.
 - Added incremental search
 
-xxxxxxxx: Version 0.1.8-BETA
+2005-07-30: Version 0.1.8-BETA
 - WARNING: muggle currently only works correctly with LD_ASSUME_KERNEL=2.4.1.
   Since 1.3.27 vdr does not enforce this anymore
 - reimplemented mugglei option -z (DeleteStaleReferences), also in the
@@ -216,6 +216,16 @@ xxxxxxxx: Version 0.1.8-BETA
   Define HAVE_PG in Make.config, details see README.postgresql
 - if instant play is used while playing from the 'play' collection,
   the latter will be resumed after instant play finishes.
+- display covers on the TV and with graphTFT. Details see README
+- Support .wav files using libsndfile (Define HAVE_SNDFILE=1 in Makefile).
+  Note that taglib cannot import any ID3 tags for wav files so that
+  currently all tracks are stored under Artist 'Unknown', Album 'Unassigned'
+  and track title being identical to the filename. Also, the progress
+  display currently does not work with .wav files.
+- Using the left and right keys during replay one can jump within the current
+  track.
+- Bug which rendered incremental search unusable implemented (thanks 
+  to sundin from vdrportal)
 - progress display: if the progress of the whole selection is shown,
   the current title will be displayed and not the name of the selection
 - if you use an order like Interpret/Album/Tracks and all songs
@@ -232,6 +242,5 @@ xxxxxxxx: Version 0.1.8-BETA
 - mugglei: do not change directory to TLD before starting the import.
   mugglei has to be started in TLD or below. This way wildcards will
   always be expanded as expected.
-- display covers on the TV and with graphTFT. Details see README
 - when tracks are added to the playing list, the playlist progress
   did not get updated.
diff --git a/Makefile b/Makefile
index 3604eb1..09f238e 100644
--- a/Makefile
+++ b/Makefile
@@ -9,15 +9,17 @@
 #
 PLUGIN = muggle
 
+#no HAVE_* flags should ever be changed in this Makefile. Instead
+#edit $VDRDIR/Make.config
+
 #if you want ogg / flac support, define HAVE_VORBISFILE and/or HAVE_FLAC
-#in $VDRDIR/Make.config like this:
-HAVE_VORBISFILE=1
-HAVE_FLAC=1
-HAVE_SNDFILE=1
+# HAVE_VORBISFILE=1
+# HAVE_FLAC=1
+# HAVE_SNDFILE=1
 
 #if you do not want to compile in code for embedded mysql,
-#define this in $VDRDIR/Make.config:
-HAVE_ONLY_SERVER=1
+#define this:
+# HAVE_ONLY_SERVER=1
 
 #define what database you want to use. Default is mysql. HAVE_SQLITE
 #removes mysql support and adds SQLite support
diff --git a/README b/README
index 1f3f4a2..e5fc27e 100644
--- a/README
+++ b/README
@@ -73,13 +73,13 @@ For example (paths and version numbers may vary)
 
 \verbatim
    cd /usr/local/src/VDR/PLUGINS/src
-   tar xvjf muggle-0.1.1.tgz
+   tar xvjf muggle-0.1.8.tgz
 \endverbatim
 
 Establish a symlink as you would for other plugins:
 
 \verbatim
-   ln -s muggle-0.1.1 muggle
+   ln -s muggle-0.1.8 muggle
 \endverbatim
 
 Adapt the Makefile to your system. Or better yet adapt your Make.config. This file might
diff --git a/mg_db.c b/mg_db.c
index f75ad81..9081217 100644
--- a/mg_db.c
+++ b/mg_db.c
@@ -1120,7 +1120,7 @@ mgDb::SyncFile(const char *filename)
 			     "%u,%s,%d,%d,%d,"
 			     "%d,%s,'',%s,%s,%s,%s,%s)",
 			     c_artist.quoted(),c_title.quoted(), 0, c_cddbid.quoted(),
-			     f.tag()->track(), c_mp3file.quoted(), 0,
+			     0, c_mp3file.quoted(), 0,
 			     0, 0,
 			     2, c_genre1.quoted(), c_lang.quoted(),
 			     c_folder1.quoted(),c_folder2.quoted(),
diff --git a/mg_db_gd_mysql.c b/mg_db_gd_mysql.c
index 5836d78..75fe7fb 100644
--- a/mg_db_gd_mysql.c
+++ b/mg_db_gd_mysql.c
@@ -42,7 +42,7 @@ mgSQLStringMySQL::unquoted() const
 		int buflen=2*strlen(m_original)+3;
   		m_unquoted = (char *) malloc( buflen);
 		mgDb* esc = DbServer->EscapeDb();
-  		if (esc)
+  		if (esc && esc->DbHandle())
   			mysql_real_escape_string( (MYSQL*)esc->DbHandle(),
 				m_unquoted, m_original, strlen(m_original) );
   		else
@@ -111,8 +111,6 @@ mgDbGd::HelpText() const
 mgDb* GenerateDB(bool SeparateThread)
 {
 	// \todo should return different backends according to the_setup.Variant
-	if (!DbServer)
-		DbServer = new mgDbServerMySQL;
 	return new mgDbGd(SeparateThread);
 }
 
@@ -465,6 +463,8 @@ mgDbGd::ServerConnect ()
     if (time(0)<m_connect_time+10)
 	return false;
     m_connect_time=time(0);
+    if (!DbServer)
+	DbServer = new mgDbServerMySQL;
     m_db = mysql_init (0);
     if (!m_db)
         return false;
diff --git a/vdr_decoder_sndfile.c b/vdr_decoder_sndfile.c
index 0b84eaf..7d45e29 100644
--- a/vdr_decoder_sndfile.c
+++ b/vdr_decoder_sndfile.c
@@ -30,12 +30,13 @@
 #include <unistd.h>
 #include <math.h>
 
-#include <tools.h>
 
 #include "mg_setup.h"
 #include "vdr_decoder_sndfile.h"
 #include "i18n.h"
 
+#include <tools.h>
+
 #ifndef SNDFILE_1
 #error You must use libsndfile version 1.x.x
 #endif