From 5c2241dddd1f79019d1a033c04910475e67b5397 Mon Sep 17 00:00:00 2001 From: John Lindgren Date: Fri, 5 Dec 2014 16:28:27 -0500 Subject: [PATCH 1/3] amidi-plug: Set Tuple::Codec. --- src/amidi-plug/amidi-plug.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/amidi-plug/amidi-plug.cc b/src/amidi-plug/amidi-plug.cc index fa1073341b..fcb3b9d443 100644 --- a/src/amidi-plug/amidi-plug.cc +++ b/src/amidi-plug/amidi-plug.cc @@ -143,6 +143,7 @@ Tuple AMIDIPlug::read_tuple (const char * filename, VFSFile & file) /* song title, get it from the filename */ Tuple tuple; tuple.set_filename (filename); + tuple.set_str (Tuple::Codec, "MIDI"); midifile_t mf; From 371a5a8b9bfd23a0d0180192c45ff4807792c8fe Mon Sep 17 00:00:00 2001 From: John Lindgren Date: Fri, 5 Dec 2014 16:48:57 -0500 Subject: [PATCH 2/3] jack-ng, qtaudio, sdlout: Fix unpausing if playback is started paused. --- src/jack-ng/jack-ng.cc | 1 + src/qtaudio/qtaudio.cc | 1 + src/sdlout/sdlout.cc | 1 + 3 files changed, 3 insertions(+) diff --git a/src/jack-ng/jack-ng.cc b/src/jack-ng/jack-ng.cc index d059863b82..656447550c 100644 --- a/src/jack-ng/jack-ng.cc +++ b/src/jack-ng/jack-ng.cc @@ -382,6 +382,7 @@ void JACKOutput::pause (bool pause) { pthread_mutex_lock (& m_mutex); m_paused = pause; + pthread_cond_broadcast (& m_cond); pthread_mutex_unlock (& m_mutex); } diff --git a/src/qtaudio/qtaudio.cc b/src/qtaudio/qtaudio.cc index f9e5c69fed..40df5583de 100644 --- a/src/qtaudio/qtaudio.cc +++ b/src/qtaudio/qtaudio.cc @@ -280,6 +280,7 @@ void QtAudio::pause (bool pause) paused = pause; + pthread_cond_broadcast (& cond); /* wake up period wait */ pthread_mutex_unlock (& mutex); } diff --git a/src/sdlout/sdlout.cc b/src/sdlout/sdlout.cc index 2f9120d1bf..cc3b379d86 100644 --- a/src/sdlout/sdlout.cc +++ b/src/sdlout/sdlout.cc @@ -317,6 +317,7 @@ void SDLOutput::pause (bool pause) if (! prebuffer_flag) SDL_PauseAudio (pause); + pthread_cond_broadcast (& sdlout_cond); /* wake up period wait */ pthread_mutex_unlock (& sdlout_mutex); } From 96c8dee6cc234a83e3c4a1f9d1ab6d9fb3f152c5 Mon Sep 17 00:00:00 2001 From: John Lindgren Date: Fri, 5 Dec 2014 17:11:42 -0500 Subject: [PATCH 3/3] Audacious Plugins 3.6-alpha1. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5d46ec5306..6cf32b082d 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl *** dnl Initialize dnl ========== AC_PREREQ([2.59]) -AC_INIT([audacious-plugins], [3.6-devel]) +AC_INIT([audacious-plugins], [3.6-alpha1]) AC_COPYRIGHT([(C) 2005-2014 Audacious Team]) AC_DEFINE_UNQUOTED([PACKAGE], "$PACKAGE_NAME", [Name of package])