From b00800d31c59fc4dc0028143bef4392af3a7fc55 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 15 Dec 2009 20:31:18 +0000
Subject: * libtunepimp updates * kmix fixes * noatun automake patch * juk
 configuration dialog enhancements * hide aRTS menu entries

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1062736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 juk/configure.in.in     |  2 +-
 juk/jukIface.h          |  1 +
 juk/playermanager.cpp   | 11 +++++++++++
 juk/playermanager.h     |  1 +
 juk/playlistinterface.h |  1 +
 5 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'juk')

diff --git a/juk/configure.in.in b/juk/configure.in.in
index 9d357c67..f2e48c0c 100644
--- a/juk/configure.in.in
+++ b/juk/configure.in.in
@@ -10,7 +10,7 @@ AC_ARG_WITH(musicbrainz,
 have_musicbrainz=no
 
 if test "x$with_musicbrainz" != xno; then
-  	KDE_CHECK_HEADER(tunepimp/tp_c.h, have_musicbrainz=yes)
+  	KDE_CHECK_HEADER(tunepimp-0.5/tp_c.h, have_musicbrainz=yes)
 
   	if test "x$with_musicbrainz" != xcheck && test "x$have_musicbrainz" != xyes; then
     		AC_MSG_ERROR([--with-musicbrainz was given, but test for MusicBrainz failed])
diff --git a/juk/jukIface.h b/juk/jukIface.h
index e119b25e..b431ea90 100644
--- a/juk/jukIface.h
+++ b/juk/jukIface.h
@@ -64,6 +64,7 @@ k_dcop:
     virtual void forward() = 0;
     virtual void seekBack() = 0;
     virtual void seekForward() = 0;
+    virtual void forwardAlbum() = 0;
 
     virtual void volumeUp() = 0;
     virtual void volumeDown() = 0;
diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp
index b60c7af5..9f784822 100644
--- a/juk/playermanager.cpp
+++ b/juk/playermanager.cpp
@@ -443,6 +443,17 @@ void PlayerManager::back()
         stop();
 }
 
+void PlayerManager::forwardAlbum()
+{
+    m_playlistInterface->playNextAlbum();
+    FileHandle file = m_playlistInterface->currentFile();
+
+    if(!file.isNull())
+        play(file);
+    else
+        stop();
+}
+
 void PlayerManager::volumeUp()
 {
     if(!player() || !m_sliderAction || !m_sliderAction->volumeSlider())
diff --git a/juk/playermanager.h b/juk/playermanager.h
index 8f1920b1..7d72d2d6 100644
--- a/juk/playermanager.h
+++ b/juk/playermanager.h
@@ -78,6 +78,7 @@ public slots:
     void playPause();
     void forward();
     void back();
+    void forwardAlbum();
     void volumeUp();
     void volumeDown();
     void mute();
diff --git a/juk/playlistinterface.h b/juk/playlistinterface.h
index 8251d4f2..af7427ce 100644
--- a/juk/playlistinterface.h
+++ b/juk/playlistinterface.h
@@ -65,6 +65,7 @@ public:
 
     virtual void playNext() = 0;
     virtual void playPrevious() = 0;
+    virtual void playNextAlbum() = 0;
     virtual void stop() = 0;
 
     virtual bool playing() const = 0;
-- 
cgit v1.2.1