* 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

15 files changed, 41 insertions, 13 deletions

diff --git a/arts/builder/artsbuilder.desktop b/arts/builder/artsbuilder.desktop
index 9d99c6d7..f4d3b31f 100644
--- a/arts/builder/artsbuilder.desktop
+++ b/arts/builder/artsbuilder.desktop
@@ -120,3 +120,4 @@ DocPath=artsbuilder/index.html
 X-DCOP-ServiceType=Multi
 OnlyShowIn=KDE;
 Categories=Qt;KDE;AudioVideo;X-KDE-More;
+NoDisplay=true
diff --git a/arts/tools/artscontrol.desktop b/arts/tools/artscontrol.desktop
index 4c7068d8..dbfffe4b 100644
--- a/arts/tools/artscontrol.desktop
+++ b/arts/tools/artscontrol.desktop
@@ -134,3 +134,4 @@ X-DCOP-ServiceType=Multi
 DocPath=artsbuilder/index.html
 OnlyShowIn=KDE;
 Categories=Qt;KDE;AudioVideo;X-KDE-More;
+NoDisplay=true
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;
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index e4cd68be..1aa97522 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -197,7 +197,7 @@ KMixWindow::updateDocking()
 
 		// create dock widget
                 // !! This should be a View in the future
-		m_dockWidget = new KMixDockWidget( Mixer::mixers().first(), this, "mainDockWidget", m_volumeWidget );
+		m_dockWidget = new KMixDockWidget( Mixer::mixers().first(), this, "mainDockWidget", m_volumeWidget, m_dockIconMuting );
 
 /* Belongs in KMixDockWidget
 		// create RMB menu
@@ -249,6 +249,7 @@ KMixWindow::saveConfig()
    config->writeEntry( "Tickmarks", m_showTicks );
    config->writeEntry( "Labels", m_showLabels );
    config->writeEntry( "startkdeRestore", m_onLogin );
+   config->writeEntry( "DockIconMuting", m_dockIconMuting );
    Mixer* mixerMasterCard = Mixer::masterCard();
    if ( mixerMasterCard != 0 ) {
       config->writeEntry( "MasterMixer", mixerMasterCard->id() );
@@ -298,6 +299,7 @@ KMixWindow::loadConfig()
    m_showLabels = config->readBoolEntry("Labels", true);
    const QString& valueStyleString = config->readEntry("ValueStyle", "None");
    m_onLogin = config->readBoolEntry("startkdeRestore", true );
+   m_dockIconMuting = config->readBoolEntry( "DockIconMuting", false);
    m_startVisible = config->readBoolEntry("Visible", true);
    m_multiDriverMode = config->readBoolEntry("MultiDriver", false);
    m_surroundView    = config->readBoolEntry("Experimental-ViewSurround", false );
@@ -428,6 +430,7 @@ KMixWindow::showSettings()
       m_prefDlg->m_showTicks->setChecked( m_showTicks );
       m_prefDlg->m_showLabels->setChecked( m_showLabels );
       m_prefDlg->m_onLogin->setChecked( m_onLogin );
+      m_prefDlg->m_dockIconMuting->setChecked( m_dockIconMuting );
       m_prefDlg->_rbVertical  ->setChecked( m_toplevelOrientation == Qt::Vertical );
       m_prefDlg->_rbHorizontal->setChecked( m_toplevelOrientation == Qt::Horizontal );
       m_prefDlg->_rbNone->setChecked( m_valueStyle == MixDeviceWidget::NNONE );
@@ -497,6 +500,7 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg )
    m_showTicks = prefDlg->m_showTicks->isChecked();
    m_showLabels = prefDlg->m_showLabels->isChecked();
    m_onLogin = prefDlg->m_onLogin->isChecked();
+   m_dockIconMuting = prefDlg->m_dockIconMuting->isChecked();
 
    if ( prefDlg->_rbNone->isChecked() ) {
      m_valueStyle = MixDeviceWidget::NNONE;
diff --git a/kmix/kmix.h b/kmix/kmix.h
index 4805d4d1..fcab67b4 100644
--- a/kmix/kmix.h
+++ b/kmix/kmix.h
@@ -100,6 +100,7 @@ KMixWindow : public KMainWindow
    bool m_volumeWidget;
    bool m_hideOnClose;
    bool m_showTicks;
+   bool m_dockIconMuting;
    bool m_showLabels;
    MixDeviceWidget::ValueStyle m_valueStyle;             // No numbers by default
    bool m_onLogin;
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 18e19af0..1a0456fe 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -47,7 +47,7 @@
 #include "kwin.h"
 #include "viewdockareapopup.h"
 
-KMixDockWidget::KMixDockWidget( Mixer *mixer, QWidget *parent, const char *name, bool volumePopup )
+KMixDockWidget::KMixDockWidget( Mixer *mixer, QWidget *parent, const char *name, bool volumePopup, bool dockIconMuting )
     : KSystemTray( parent, name ),
       m_mixer(mixer),
       _dockAreaPopup(0L),
@@ -55,7 +55,8 @@ KMixDockWidget::KMixDockWidget( Mixer *mixer, QWidget *parent, const char *name,
       _playBeepOnVolumeChange(false), // disabled due to triggering a "Bug"
       _oldToolTipValue(-1),
       _oldPixmapType('-'),
-      _volumePopup(volumePopup)
+      _volumePopup(volumePopup),
+      _dockIconMuting(dockIconMuting)
 {
     Mixer* preferredMasterMixer = Mixer::masterCard();
     if ( preferredMasterMixer != 0 ) {
@@ -294,7 +295,11 @@ KMixDockWidget::mousePressEvent(QMouseEvent *me)
 		return;
 	} // LeftMouseButton pressed
 	else if ( me->button() ==  MidButton ) {
-		toggleActive();
+		if ( ! _dockIconMuting ) {
+            toggleActive();
+        } else {
+            dockMute();
+        }
 		return;
 	}
 	else {
diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h
index 273e8533..c1f0d8dd 100644
--- a/kmix/kmixdockwidget.h
+++ b/kmix/kmixdockwidget.h
@@ -43,7 +43,7 @@ class KMixDockWidget : public KSystemTray  {
    friend class KMixWindow;
 
  public:
-   KMixDockWidget(Mixer *, QWidget *parent=0, const char *name=0, bool volumePopup=true);
+   KMixDockWidget(Mixer *, QWidget *parent=0, const char *name=0, bool volumePopup=true, bool dockIconMuting=false);
    ~KMixDockWidget();
 
    void setErrorPixmap();
@@ -73,6 +73,7 @@ class KMixDockWidget : public KSystemTray  {
    int  _oldToolTipValue;
    char _oldPixmapType;
    bool _volumePopup;
+   bool _dockIconMuting;
  private slots:
    void dockMute();
    void selectMaster();
diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp
index e2788ceb..9c5fbd42 100644
--- a/kmix/kmixprefdlg.cpp
+++ b/kmix/kmixprefdlg.cpp
@@ -68,6 +68,10 @@ KMixPrefDlg::KMixPrefDlg( QWidget *parent )
    m_onLogin = new QCheckBox( i18n("Restore volumes on login"), m_generalTab );
    layout->addWidget( m_onLogin );
 
+   m_dockIconMuting = new QCheckBox( 
+            i18n("Middle click on system tray icon toggles muting"), m_generalTab );
+   layout->addWidget( m_dockIconMuting );
+
    QBoxLayout *numbersLayout = new QHBoxLayout( layout );
    QButtonGroup *numbersGroup = new QButtonGroup( 3, Qt::Horizontal, i18n("Numbers"), m_generalTab );
    numbersGroup->setRadioButtonExclusive(true);
diff --git a/kmix/kmixprefdlg.h b/kmix/kmixprefdlg.h
index 3519d045..eb4222ed 100644
--- a/kmix/kmixprefdlg.h
+++ b/kmix/kmixprefdlg.h
@@ -57,6 +57,7 @@ KMixPrefDlg : public KDialogBase
    QCheckBox *m_showTicks;
    QCheckBox *m_showLabels;
    QCheckBox *m_onLogin;
+   QCheckBox *m_dockIconMuting;
    QRadioButton *_rbVertical;
    QRadioButton *_rbHorizontal;
    QRadioButton *_rbNone;
diff --git a/mpeglib/configure.in.in b/mpeglib/configure.in.in
index 1435874b..28a57cf0 100644
--- a/mpeglib/configure.in.in
+++ b/mpeglib/configure.in.in
@@ -144,12 +144,6 @@ OS_TYPE=`uname -s`
 AC_MSG_RESULT($OS_TYPE)
 
 INTELCPPFLAG=
-dnl MMX_SUPPORT is set as variable in main configure.in.in
-dnl now make it a config.h entry
-if test x$MMX_SUPPORT = xyes; then
-   AC_DEFINE(INTEL,1,[Define if you have MMX support on x86 with gcc])
-   INTELCPPFLAG="-DINTEL"
-fi
 AC_SUBST(INTELCPPFLAG)
 
 AC_DEFUN([KDE_MPEGLIB_COMPILES],
diff --git a/noatun/Makefile.am b/noatun/Makefile.am
index bb024d36..2dd06107 100644
--- a/noatun/Makefile.am
+++ b/noatun/Makefile.am
@@ -11,7 +11,9 @@ presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero
 
 updatedir = $(kde_datadir)/kconf_update
 update_DATA = noatun.upd
-update_PROGRAMS = noatun20update
+
+kconfdir = $(libdir)/kconf_update_bin
+kconf_PROGRAMS = noatun20update
 
 noatun20update_SOURCES  = noatun20update.cpp
 noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)