From b1e7189981908fdc53de008f6929220529043b59 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Wed, 1 Oct 2008 18:06:40 +0000
Subject: resolved signal name conflict

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@572 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/qmmp/decoder.cpp   | 2 +-
 src/qmmp/decoder.h     | 2 +-
 src/qmmp/soundcore.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/qmmp/decoder.cpp b/src/qmmp/decoder.cpp
index c6c1f83b1..a931faab3 100644
--- a/src/qmmp/decoder.cpp
+++ b/src/qmmp/decoder.cpp
@@ -167,7 +167,7 @@ qint64 Decoder::produceSound(char *data, qint64 size, quint32 brate, int chan)
 void Decoder::finish()
 {
     //output()->wait();
-    emit finished();
+    emit playbackFinished();
 }
 
 void Decoder::changeVolume(char *data, qint64 size, int chan)
diff --git a/src/qmmp/decoder.h b/src/qmmp/decoder.h
index 08931563c..33404855c 100644
--- a/src/qmmp/decoder.h
+++ b/src/qmmp/decoder.h
@@ -73,7 +73,7 @@ public:
     static bool isEnabled(DecoderFactory* factory);
 
 signals:
-    void finished();
+    void playbackFinished();
 
 protected:
     void configure(quint32 srate, int chan, int bps);
diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp
index 14afd503a..9180b486a 100644
--- a/src/qmmp/soundcore.cpp
+++ b/src/qmmp/soundcore.cpp
@@ -373,7 +373,7 @@ bool SoundCore::decode()
         return FALSE;
     }
     qDebug ("ok");
-    connect(m_decoder, SIGNAL(finished()), SIGNAL(finished()));
+    connect(m_decoder, SIGNAL(playbackFinished()), SIGNAL(finished()));
     if (m_output)
         m_output->setStateHandler(m_decoder->stateHandler());
 
-- 
cgit v1.2.3-13-gbd6f