Mercurial > audlegacy-plugins
changeset 1020:fe9ffc829b5f trunk
[svn] - amidi-plug works again (uses auddrct.h in place of the deprecated beepctrl.h)
| author | giacomo |
|---|---|
| date | Fri, 11 May 2007 17:01:10 -0700 |
| parents | 6f1848706fc4 |
| children | da9d6ad2b5b5 |
| files | ChangeLog src/amidi-plug/amidi-plug.c src/amidi-plug/amidi-plug.h src/amidi-plug/i_common.h src/amidi-plug/i_configure.c |
| diffstat | 5 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 11 15:45:20 2007 -0700 +++ b/ChangeLog Fri May 11 17:01:10 2007 -0700 @@ -1,3 +1,10 @@ +2007-05-11 22:45:20 +0000 Giacomo Lozito <james@develia.org> + revision [2202] + - aosd: remove aosd_osd_check_composite_mgr from where it was not supposed to be + trunk/src/aosd/aosd.c | 1 - + 1 file changed, 1 deletion(-) + + 2007-05-11 16:48:31 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [2200] - make metadata display in Audacious again.
--- a/src/amidi-plug/amidi-plug.c Fri May 11 15:45:20 2007 -0700 +++ b/src/amidi-plug/amidi-plug.c Fri May 11 17:01:10 2007 -0700 @@ -284,7 +284,7 @@ { pthread_mutex_unlock( &amidiplug_playing_mutex ); DEBUGMSG( "GETTIME on halted song (an error occurred?), returning -1 and stopping the player\n" ); - xmms_remote_stop(0); + audacious_drct_stop(); return -1; } } @@ -311,7 +311,7 @@ { pthread_mutex_unlock( &amidiplug_playing_mutex ); DEBUGMSG( "GETTIME on halted song (an error occurred?), returning -1 and stopping the player\n" , time ); - xmms_remote_stop(0); + audacious_drct_stop(); return -1; } }
--- a/src/amidi-plug/amidi-plug.h Fri May 11 15:45:20 2007 -0700 +++ b/src/amidi-plug/amidi-plug.h Fri May 11 17:01:10 2007 -0700 @@ -29,7 +29,7 @@ #include "i_common.h" #include <audacious/plugin.h> #include <audacious/output.h> -#include <audacious/beepctrl.h> +#include <audacious/auddrct.h> #include <pthread.h> #include "i_vfslayer.h" #include "i_backend.h"
--- a/src/amidi-plug/i_common.h Fri May 11 15:45:20 2007 -0700 +++ b/src/amidi-plug/i_common.h Fri May 11 17:01:10 2007 -0700 @@ -43,7 +43,7 @@ #endif /* DEBUG */ -#define AMIDIPLUG_VERSION "0.7+" +#define AMIDIPLUG_VERSION "0.7++" #define PLAYER_NAME "Audacious" #define PLAYER_LOCALRCDIR ".audacious" #define G_PATH_GET_BASENAME(x) g_path_get_basename(x)
--- a/src/amidi-plug/i_configure.c Fri May 11 15:45:20 2007 -0700 +++ b/src/amidi-plug/i_configure.c Fri May 11 17:01:10 2007 -0700 @@ -28,7 +28,7 @@ #include "i_configure-fluidsynth.h" #include "i_configure-dummy.h" #include "i_utils.h" -#include <audacious/beepctrl.h> +#include <audacious/auddrct.h> #include <audacious/util.h> @@ -227,7 +227,7 @@ void i_configure_ev_bokcheck( GtkWidget * button_ok , gpointer configwin ) { - if ( xmms_remote_is_playing(0) || xmms_remote_is_paused(0) ) + if ( audacious_drct_get_playing() || audacious_drct_get_paused() ) { /* we can't change settings while a song is being played */ static GtkWidget * configwin_warnmsg = NULL;