Merge branch 'master' into devel

Conflicts:
	configure.ac
	deadbeef.h
	plugins/mpgmad/mpgmad.c

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/adplug/adplug-db.cpp b/plugins/adplug/adplug-db.cpp
index ba95739f..6d6cb35c 100644
--- a/plugins/adplug/adplug-db.cpp
+++ b/plugins/adplug/adplug-db.cpp
@@ -60,7 +60,7 @@ adplug_init (DB_playItem_t *it) {
     decoder = CAdPlug::factory (it->fname, opl, CAdPlug::players);
     if (!decoder) {
         trace ("adplug: failed to open %s\n", it->fname);
-        return NULL;
+        return -1;
     }
 
     subsong = it->tracknum;
@@ -75,7 +75,7 @@ adplug_init (DB_playItem_t *it) {
     adplug_plugin.info.samplerate = samplerate;
     adplug_plugin.info.readpos = 0;
 
-//    trace ("adplug_init ok (duration=%f, totalsamples=%d)\n", deadbeef->pl_get_item_duration (it), totalsamples);
+    trace ("adplug_init ok (duration=%f, totalsamples=%d)\n", deadbeef->pl_get_item_duration (it), totalsamples);
 
     return 0;
 }