Package: kicker-applets Severity: wishlist Tags: patch Hello.
I've just added Audacious support to mediacontrol applet. Here's the patch which enables this. Note that you have to re-generate configure script as I added modifications to kicker-applets/mediacontrol/configure.in.in and thus they are in configure.in. -- WBR, Andrew
diff -u kdeaddons-3.5.9/config.h.in kdeaddons-3.5.9/config.h.in --- kdeaddons-3.5.9/config.h.in 2008-02-13 16:57:15.000000000 +0200 +++ kdeaddons-3.5.9/config.h.in 2008-08-06 00:53:07.000000000 +0300 @@ -3,6 +3,9 @@ /* Define if you have Berkeley DB++ installed */ #undef BERKELEY_DB +/* Define if you have Audacious libraries and header files. */ +#undef HAVE_AUDACIOUS + /* Define to 1 if you have the <Carbon/Carbon.h> header file. */ #undef HAVE_CARBON_CARBON_H diff -u kdeaddons-3.5.9/configure.in kdeaddons-3.5.9/configure.in --- kdeaddons-3.5.9/configure.in 2008-08-06 01:16:07.000000000 +0300 +++ kdeaddons-3.5.9/configure.in 2008-08-06 00:09:24.000000000 +0300 @@ -156,6 +156,51 @@ AC_SUBST(XMMS_LIBS) AC_SUBST(XMMS_INCLUDES) + + +AC_DEFUN([AC_CHECK_AUDACIOUS], +[ + AC_MSG_CHECKING([for libaudclient]) + AC_CACHE_VAL(ac_cv_have_audacious, + [ + ac_save_libs="$LIBS" + LIBS="`pkg-config --libs audclient`" + ac_CPPFLAGS_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $all_includes `pkg-config --cflags audclient 2> /dev/null`" + ac_LDFLAGS_save="$LDFLAGS" + LDFLAGS="$LDFLAGS $all_libraries" + AC_TRY_LINK( + [#include <audacious/audctrl.h>], + [audacious_remote_play_pause(0);], + [ac_cv_have_audacious="yes"], + [ac_cv_have_audacious="no"] + ) + LIBS="$ac_save_libs" + LDFLAGS="$ac_LDFLAGS_save" + CPPFLAGS="$ac_CPPFLAGS_save" + ]) + AC_MSG_RESULT($ac_cv_have_audacious) + if test "$ac_cv_have_audacious" = "yes"; then + AUDACIOUS_LIBS="`pkg-config --libs audclient`" + AUDACIOUS_INCLUDES="`pkg-config --cflags audclient`" + AC_DEFINE(HAVE_AUDACIOUS, 1, [Define if you have Audacious libraries and header files.]) + fi +]) + +AC_ARG_WITH(audacious, + [AC_HELP_STRING([--with-audacious],[enable Audacious control applet @<:@default=check@:>@])], + [], with_audacious=check) + +if test "x$with_audacious" != xno; then + AC_CHECK_AUDACIOUS + + if test "x$with_audacious" != xcheck && test "x$ac_cv_have_audacious" != xyes; then + AC_MSG_ERROR([--with-audacious was given, but test for Audacious failed]) + fi +fi + +AC_SUBST(AUDACIOUS_LIBS) +AC_SUBST(AUDACIOUS_INCLUDES) dnl ======================================================= dnl FILE: ./konq-plugins/sidebar/metabar/configure.in.in dnl ======================================================= diff -u kdeaddons-3.5.9/Makefile.in kdeaddons-3.5.9/Makefile.in --- kdeaddons-3.5.9/Makefile.in 2008-08-06 01:16:07.000000000 +0300 +++ kdeaddons-3.5.9/Makefile.in 2008-08-06 00:28:11.000000000 +0300 @@ -89,6 +78,8 @@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ +AUDACIOUS_INCLUDES = @AUDACIOUS_INCLUDES@ +AUDACIOUS_LIBS = @AUDACIOUS_LIBS@ AUTOCONF = @AUTOCONF@ AUTODIRS = @AUTODIRS@ AUTOHEADER = @AUTOHEADER@ diff -u kdeaddons-3.5.9/kicker-applets/Makefile.in kdeaddons-3.5.9/kicker-applets/Makefile.in --- kdeaddons-3.5.9/kicker-applets/Makefile.in 2008-08-06 01:16:07.000000000 +0300 +++ kdeaddons-3.5.9/kicker-applets/Makefile.in 2008-08-05 23:38:14.000000000 +0300 @@ -72,6 +72,8 @@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ +AUDACIOUS_INCLUDES = @AUDACIOUS_INCLUDES@ +AUDACIOUS_LIBS = @AUDACIOUS_LIBS@ AUTOCONF = @AUTOCONF@ AUTODIRS = @AUTODIRS@ AUTOHEADER = @AUTOHEADER@ diff -uN kdeaddons-3.5.9/kicker-applets/mediacontrol/audaciousInterface.cpp kdeaddons-3.5.9/kicker-applets/mediacontrol/audaciousInterface.cpp --- kdeaddons-3.5.9/kicker-applets/mediacontrol/audaciousInterface.cpp 1970-01-01 03:00:00.000000000 +0300 +++ kdeaddons-3.5.9/kicker-applets/mediacontrol/audaciousInterface.cpp 2008-08-06 01:08:03.000000000 +0300 @@ -0,0 +1,202 @@ +/*************************************************************************** + Interface to access Audacious + ------------------- + begin : Tue Apr 25 11:53:11 CEST 2000 + copyright : (C) 2000-2002 by Stefan Gehn + email : metz {AT} gehn {DOT} net + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#ifdef HAVE_AUDACIOUS // only use if there is Audacious installed on compiletime + +#include "audaciousInterface.h" +#include "audaciousInterface.moc" +#include <audacious/audctrl.h> +#include <audacious/dbus.h> +#include <kdebug.h> + +#define TIMER_SLOW 1000 +#define TIMER_FAST 100 +#define AUDACIOUS_SESSION dbus_proxy + +static DBusGProxy *dbus_proxy = NULL; +static DBusGConnection *connection = NULL; + +AudaciousInterface::AudaciousInterface() : PlayerInterface() +{ + GError *err = NULL; + timervalue = TIMER_FAST; + bStartingAudacious = false; + audacious_timer = new QTimer ( this, "audacious_timer" ); + + QObject::connect( audacious_timer, SIGNAL(timeout()), SLOT(updateSlider()) ); + + g_type_init(); + + connection = dbus_g_bus_get(DBUS_BUS_SESSION, &err); + + if (connection == NULL) + { + kdDebug(90200) << "D-Bus Error:" << err->message << endl; + return; + } + + dbus_proxy = dbus_g_proxy_new_for_name(connection, AUDACIOUS_DBUS_SERVICE, + AUDACIOUS_DBUS_PATH, + AUDACIOUS_DBUS_INTERFACE); + + // Better start the timer as late as possible in initialization + audacious_timer->start ( timervalue ); +} + +AudaciousInterface::~AudaciousInterface() +{ + delete audacious_timer; +} + +void AudaciousInterface::updateSlider ( void ) +{ + if ( !audacious_remote_is_running(AUDACIOUS_SESSION) ) + { // Audacious not running + if (timervalue == TIMER_FAST) // timer is running fast + { + emit playerStopped(); + timervalue = TIMER_SLOW; // timer does not need to run fast if Audacious is not running + audacious_timer->changeInterval(timervalue); + emit newSliderPosition(0,0); + } + return; // as Audacious is not running we can leave now + } + + // huh, Audacious is running :) + if (timervalue == TIMER_SLOW) // what? Still running slow? + { + emit playerStarted(); + timervalue = TIMER_FAST; // boost the timer to have better reaction-times for the applet + audacious_timer->changeInterval(timervalue); + } + + int len = audacious_remote_get_playlist_time ( AUDACIOUS_SESSION, audacious_remote_get_playlist_pos(AUDACIOUS_SESSION) ); + int time = audacious_remote_get_output_time(AUDACIOUS_SESSION); + + if (len < 0) + { + len = 0; + time = 0; + } + + emit newSliderPosition(len,time); + emit playingStatusChanged(playingStatus()); +} + + +// Drag-n-Drop stuff ================================================================= + +void AudaciousInterface::dragEnterEvent(QDragEnterEvent* event) +{ + event->accept( QTextDrag::canDecode(event) ); +} + +void AudaciousInterface::dropEvent(QDropEvent* event) +{ + QString text; +// kdDebug(90200) << "AudaciousInterface::dropEvent()" << endl; + if ( QTextDrag::decode(event, text) ) + { + audacious_remote_playlist_add_url_string(AUDACIOUS_SESSION, + (gchar *)text.local8Bit().data()); + } +} + +// ==================================================================================== + + +void AudaciousInterface::sliderStartDrag() +{ + audacious_timer->stop(); +} + +void AudaciousInterface::sliderStopDrag() +{ + audacious_timer->start( timervalue ); +} + +void AudaciousInterface::jumpToTime( int msec ) +{ + audacious_remote_jump_to_time(AUDACIOUS_SESSION, msec); +} + +void AudaciousInterface::playpause() +{ + if (!audacious_remote_is_running(AUDACIOUS_SESSION)) + { + if (bStartingAudacious) + return; + startPlayer("audacious"); + bStartingAudacious = true; + QTimer::singleShot(500, this, SLOT(playpause())); + } + else + { + bStartingAudacious = false; + audacious_remote_play_pause(AUDACIOUS_SESSION); + } +} + +void AudaciousInterface::stop() +{ + audacious_remote_stop(AUDACIOUS_SESSION); +} + +void AudaciousInterface::next() +{ + audacious_remote_playlist_next(AUDACIOUS_SESSION); +} + +void AudaciousInterface::prev() +{ + audacious_remote_playlist_prev(AUDACIOUS_SESSION); +} + +void AudaciousInterface::volumeUp() +{ + const int cur = audacious_remote_get_main_volume(AUDACIOUS_SESSION); + audacious_remote_set_main_volume(AUDACIOUS_SESSION, cur+1); +} + +void AudaciousInterface::volumeDown() +{ + const int cur = audacious_remote_get_main_volume(AUDACIOUS_SESSION); + audacious_remote_set_main_volume(AUDACIOUS_SESSION, cur-1); +} + +int AudaciousInterface::playingStatus() +{ + if (audacious_remote_is_paused(AUDACIOUS_SESSION)) + return Paused; + + if (audacious_remote_is_playing(AUDACIOUS_SESSION)) + return Playing; + + return Stopped; +} + +const QString AudaciousInterface::getTrackTitle() const +{ + return QString::fromLocal8Bit( + audacious_remote_get_playlist_title(AUDACIOUS_SESSION, + audacious_remote_get_playlist_pos(AUDACIOUS_SESSION))); +} +#endif // HAVE_AUDACIOUS diff -uN kdeaddons-3.5.9/kicker-applets/mediacontrol/audaciousInterface.h kdeaddons-3.5.9/kicker-applets/mediacontrol/audaciousInterface.h --- kdeaddons-3.5.9/kicker-applets/mediacontrol/audaciousInterface.h 1970-01-01 03:00:00.000000000 +0300 +++ kdeaddons-3.5.9/kicker-applets/mediacontrol/audaciousInterface.h 2008-08-06 00:18:49.000000000 +0300 @@ -0,0 +1,59 @@ +/*************************************************************************** + Interface to access Audacious + ------------------- + begin : Tue Apr 25 11:53:11 CEST 2000 + copyright : (C) 2000-2002 by Stefan Gehn + email : metz {AT} gehn {DOT} net + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#ifdef HAVE_AUDACIOUS // only use if there's Audaious installed on compiletime + +#ifndef AUDACIOUSINTERFACE_H +#define AUDACIOUSINTERFACE_H + +#include "playerInterface.h" +#include <qtimer.h> + +class AudaciousInterface : public PlayerInterface +{ + Q_OBJECT + public: + AudaciousInterface(); + ~AudaciousInterface(); + + public slots: + virtual void updateSlider(); + virtual void sliderStartDrag(); + virtual void sliderStopDrag(); + virtual void jumpToTime(int msec); + virtual void playpause(); + virtual void stop(); + virtual void next(); + virtual void prev(); + virtual void volumeUp(); + virtual void volumeDown(); + virtual void dragEnterEvent(QDragEnterEvent* event); + virtual void dropEvent(QDropEvent* event); + virtual const QString getTrackTitle() const; + virtual int playingStatus(); + + private: + QTimer *audacious_timer; + int timervalue; + bool bStartingAudacious; +}; +#endif // AUDACIOUSINTERFACE_H +#endif // HAVE_AUDACIOUS diff -uN kdeaddons-3.5.9/kicker-applets/mediacontrol/configure.in.in kdeaddons-3.5.9/kicker-applets/mediacontrol/configure.in.in --- kdeaddons-3.5.9/kicker-applets/mediacontrol/configure.in.in 2005-09-10 11:14:17.000000000 +0300 +++ kdeaddons-3.5.9/kicker-applets/mediacontrol/configure.in.in 2008-08-06 00:08:35.000000000 +0300 @@ -46,3 +46,48 @@ AC_SUBST(XMMS_LIBS) AC_SUBST(XMMS_INCLUDES) + + +AC_DEFUN([AC_CHECK_AUDACIOUS], +[ + AC_MSG_CHECKING([for libaudclient]) + AC_CACHE_VAL(ac_cv_have_audacious, + [ + ac_save_libs="$LIBS" + LIBS="`pkg-config --libs audclient`" + ac_CPPFLAGS_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $all_includes `pkg-config --cflags audclient 2> /dev/null`" + ac_LDFLAGS_save="$LDFLAGS" + LDFLAGS="$LDFLAGS $all_libraries" + AC_TRY_LINK( + [#include <audacious/audctrl.h>], + [audacious_remote_play_pause(0);], + [ac_cv_have_audacious="yes"], + [ac_cv_have_audacious="no"] + ) + LIBS="$ac_save_libs" + LDFLAGS="$ac_LDFLAGS_save" + CPPFLAGS="$ac_CPPFLAGS_save" + ]) + AC_MSG_RESULT($ac_cv_have_audacious) + if test "$ac_cv_have_audacious" = "yes"; then + AUDACIOUS_LIBS="`pkg-config --libs audclient`" + AUDACIOUS_INCLUDES="`pkg-config --cflags audclient`" + AC_DEFINE(HAVE_AUDACIOUS, 1, [Define if you have Audacious libraries and header files.]) + fi +]) + +AC_ARG_WITH(audacious, + [AC_HELP_STRING([--with-audacious],[enable Audacious control applet @<:@default=check@:>@])], + [], with_audacious=check) + +if test "x$with_audacious" != xno; then + AC_CHECK_AUDACIOUS + + if test "x$with_audacious" != xcheck && test "x$ac_cv_have_audacious" != xyes; then + AC_MSG_ERROR([--with-audacious was given, but test for Audacious failed]) + fi +fi + +AC_SUBST(AUDACIOUS_LIBS) +AC_SUBST(AUDACIOUS_INCLUDES) diff -uN kdeaddons-3.5.9/kicker-applets/mediacontrol/Makefile.am kdeaddons-3.5.9/kicker-applets/mediacontrol/Makefile.am --- kdeaddons-3.5.9/kicker-applets/mediacontrol/Makefile.am 2005-09-10 11:14:17.000000000 +0300 +++ kdeaddons-3.5.9/kicker-applets/mediacontrol/Makefile.am 2008-08-05 23:36:44.000000000 +0300 @@ -1,5 +1,5 @@ SUBDIRS = . pics -INCLUDES = $(XMMS_INCLUDES) $(all_includes) +INCLUDES = $(XMMS_INCLUDES) $(AUDACIOUS_INCLUDES) $(all_includes) METASOURCES = AUTO kde_module_LTLIBRARIES = mediacontrol_panelapplet.la @@ -11,12 +11,13 @@ mediacontrolconfig.cpp mediacontroliface.skel \ noatunInterface.cpp \ xmmsInterface.cpp \ + audaciousInterface.cpp \ mpdInterface.cpp \ jukInterface.cpp \ amarokInterface.cpp \ kscdInterface.cpp -mediacontrol_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(XMMS_LIBS) +mediacontrol_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(XMMS_LIBS) $(AUDACIOUS_LIBS) mediacontrol_panelapplet_la_LIBADD = $(LIB_KDEUI) lnkdir = $(kde_datadir)/kicker/applets diff -uN kdeaddons-3.5.9/kicker-applets/mediacontrol/Makefile.in kdeaddons-3.5.9/kicker-applets/mediacontrol/Makefile.in --- kdeaddons-3.5.9/kicker-applets/mediacontrol/Makefile.in 2008-08-06 01:16:07.000000000 +0300 +++ kdeaddons-3.5.9/kicker-applets/mediacontrol/Makefile.in 2008-08-06 00:41:04.000000000 +0300 @@ -60,7 +60,8 @@ am_mediacontrol_panelapplet_la_OBJECTS = mcslider.lo mediacontrol.lo \ playerInterface.lo configfrontend.lo mediacontrolconfig.lo \ noatunInterface.lo xmmsInterface.lo mpdInterface.lo \ - jukInterface.lo amarokInterface.lo kscdInterface.lo + jukInterface.lo amarokInterface.lo kscdInterface.lo \ + audaciousInterface.lo #>- mediacontrol_panelapplet_la_OBJECTS = \ #>- $(am_mediacontrol_panelapplet_la_OBJECTS) #>+ 7 @@ -68,7 +69,8 @@ mediacontrol_panelapplet_la_nofinal_OBJECTS = mcslider.lo mediacontrol.lo \ playerInterface.lo configfrontend.lo mediacontrolconfig.lo \ noatunInterface.lo xmmsInterface.lo mpdInterface.lo \ - jukInterface.lo amarokInterface.lo kscdInterface.lo mediacontroliface_skel.lo mediacontrolconfigwidget.lo + jukInterface.lo amarokInterface.lo kscdInterface.lo mediacontroliface_skel.lo mediacontrolconfigwidget.lo \ + audaciousInterface.lo @[EMAIL PROTECTED] = $(mediacontrol_panelapplet_la_nofinal_OBJECTS) @[EMAIL PROTECTED] = $(mediacontrol_panelapplet_la_final_OBJECTS) #>- mediacontrol_panelapplet_la_LINK = $(LIBTOOL) --tag=CXX \ @@ -134,6 +136,8 @@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ +AUDACIOUS_INCLUDES = @AUDACIOUS_INCLUDES@ +AUDACIOUS_LIBS = @AUDACIOUS_LIBS@ AUTOCONF = @AUTOCONF@ AUTODIRS = @AUTODIRS@ AUTOHEADER = @AUTOHEADER@ @@ -386,7 +390,7 @@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ SUBDIRS = . pics -INCLUDES = $(XMMS_INCLUDES) $(all_includes) +INCLUDES = $(XMMS_INCLUDES) $(AUDACIOUS_INCLUDES) $(all_includes) #>- METASOURCES = AUTO kde_module_LTLIBRARIES = mediacontrol_panelapplet.la mediacontrol_panelapplet_la_COMPILE_FIRST = mediacontrolconfigwidget.h @@ -407,12 +411,13 @@ mediacontrolconfig.cpp \ noatunInterface.cpp \ xmmsInterface.cpp \ + audaciousInterface.cpp \ mpdInterface.cpp \ jukInterface.cpp \ amarokInterface.cpp \ kscdInterface.cpp mediacontroliface_skel.cpp mediacontrolconfigwidget.cpp -mediacontrol_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(XMMS_LIBS) +mediacontrol_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(XMMS_LIBS) $(AUDACIOUS_LIBS) mediacontrol_panelapplet_la_LIBADD = $(LIB_KDEUI) lnkdir = $(kde_datadir)/kicker/applets lnk_DATA = mediacontrol.desktop @@ -502,6 +507,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@ @@ -922,6 +928,13 @@ mocs: xmmsInterface.moc #>+ 3 +audaciousInterface.moc: $(srcdir)/audaciousInterface.h + $(MOC) $(srcdir)/audaciousInterface.h -o audaciousInterface.moc + +#>+ 2 +mocs: audaciousInterface.moc + +#>+ 3 noatunInterface.moc: $(srcdir)/noatunInterface.h $(MOC) $(srcdir)/noatunInterface.h -o noatunInterface.moc @@ -1001,11 +1014,11 @@ #>+ 11 -mediacontrol_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mcslider.cpp $(srcdir)/mediacontrol.cpp $(srcdir)/playerInterface.cpp $(srcdir)/configfrontend.cpp $(srcdir)/mediacontrolconfig.cpp $(srcdir)/noatunInterface.cpp $(srcdir)/xmmsInterface.cpp $(srcdir)/mpdInterface.cpp $(srcdir)/jukInterface.cpp $(srcdir)/amarokInterface.cpp $(srcdir)/kscdInterface.cpp mediacontroliface_skel.cpp mediacontrolconfigwidget.cpp jukInterface.moc configfrontend.moc mediacontrolconfig.moc mediacontrolconfigwidget.moc mediacontrol.moc playerInterface.moc mcslider.moc amarokInterface.moc xmmsInterface.moc noatunInterface.moc mpdInterface.moc kscdInterface.moc +mediacontrol_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mcslider.cpp $(srcdir)/mediacontrol.cpp $(srcdir)/playerInterface.cpp $(srcdir)/configfrontend.cpp $(srcdir)/mediacontrolconfig.cpp $(srcdir)/noatunInterface.cpp $(srcdir)/xmmsInterface.cpp $(srcdir)/mpdInterface.cpp $(srcdir)/jukInterface.cpp $(srcdir)/amarokInterface.cpp $(srcdir)/kscdInterface.cpp mediacontroliface_skel.cpp mediacontrolconfigwidget.cpp jukInterface.moc configfrontend.moc mediacontrolconfig.moc mediacontrolconfigwidget.moc mediacontrol.moc playerInterface.moc mcslider.moc amarokInterface.moc xmmsInterface.moc noatunInterface.moc mpdInterface.moc kscdInterface.moc audaciousInterface.moc @echo 'creating mediacontrol_panelapplet_la.all_cpp.cpp ...'; \ rm -f mediacontrol_panelapplet_la.all_cpp.files mediacontrol_panelapplet_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> mediacontrol_panelapplet_la.all_cpp.final; \ - for file in mcslider.cpp mediacontrol.cpp playerInterface.cpp configfrontend.cpp mediacontrolconfig.cpp noatunInterface.cpp xmmsInterface.cpp mpdInterface.cpp jukInterface.cpp amarokInterface.cpp kscdInterface.cpp mediacontroliface_skel.cpp mediacontrolconfigwidget.cpp ; do \ + for file in mcslider.cpp mediacontrol.cpp playerInterface.cpp configfrontend.cpp mediacontrolconfig.cpp noatunInterface.cpp xmmsInterface.cpp mpdInterface.cpp jukInterface.cpp amarokInterface.cpp kscdInterface.cpp audaciousInterface.cpp mediacontroliface_skel.cpp mediacontrolconfigwidget.cpp ; do \ echo "#include \"$$file\"" >> mediacontrol_panelapplet_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> mediacontrol_panelapplet_la.all_cpp.final; \ done; \ @@ -1045,6 +1058,7 @@ mediacontrol.lo: mediacontrol.moc mpdInterface.lo: mpdInterface.moc xmmsInterface.o: xmmsInterface.moc +audaciousInterface.o: audaciousInterface.moc noatunInterface.lo: noatunInterface.moc mpdInterface.o: mpdInterface.moc $(srcdir)/playerInterface.cpp: mediacontrolconfigwidget.h mediacontrolconfigwidget.h @@ -1060,6 +1074,8 @@ jukInterface.o: jukInterface.moc $(srcdir)/xmmsInterface.cpp: mediacontrolconfigwidget.h mediacontrolconfigwidget.h xmmsInterface.lo: xmmsInterface.moc +$(srcdir)/audaciousInterface.cpp: mediacontrolconfigwidget.h mediacontrolconfigwidget.h +audaciousInterface.lo: audaciousInterface.moc amarokInterface.lo: amarokInterface.moc $(srcdir)/mediacontrolconfig.cpp: mediacontrolconfigwidget.h mediacontrolconfigwidget.h $(srcdir)/noatunInterface.cpp: mediacontrolconfigwidget.h mediacontrolconfigwidget.h diff -uN kdeaddons-3.5.9/kicker-applets/mediacontrol/mediacontrolconfig.cpp kdeaddons-3.5.9/kicker-applets/mediacontrol/mediacontrolconfig.cpp --- kdeaddons-3.5.9/kicker-applets/mediacontrol/mediacontrolconfig.cpp 2005-09-10 11:14:17.000000000 +0300 +++ kdeaddons-3.5.9/kicker-applets/mediacontrol/mediacontrolconfig.cpp 2008-08-06 00:15:19.000000000 +0300 @@ -55,6 +55,9 @@ #ifdef HAVE_XMMS _child->playerListBox->insertItem("XMMS"); #endif +#ifdef HAVE_AUDACIOUS + _child->playerListBox->insertItem("Audacious"); +#endif _child->playerListBox->insertItem("Noatun"); _child->playerListBox->insertItem("Amarok"); _child->playerListBox->insertItem("JuK"); diff -uN kdeaddons-3.5.9/kicker-applets/mediacontrol/mediacontrol.cpp kdeaddons-3.5.9/kicker-applets/mediacontrol/mediacontrol.cpp --- kdeaddons-3.5.9/kicker-applets/mediacontrol/mediacontrol.cpp 2007-05-14 10:37:20.000000000 +0300 +++ kdeaddons-3.5.9/kicker-applets/mediacontrol/mediacontrol.cpp 2008-08-06 00:14:18.000000000 +0300 @@ -28,6 +28,7 @@ #include "noatunInterface.h" #include "xmmsInterface.h" +#include "audaciousInterface.h" #include "jukInterface.h" #include "amarokInterface.h" #include "mpdInterface.h" @@ -363,6 +364,15 @@ } else #endif +#ifdef HAVE_AUDACIOUS + if (playerString == "Audacious") + { + _player = new AudaciousInterface (); + time_slider->setSteps((_configFrontend->mouseWheelSpeed()*1000), + (_configFrontend->mouseWheelSpeed()*1000)); + } + else +#endif if (playerString == "JuK") { _player = new JuKInterface();
signature.asc
Description: This is a digitally signed message part.