Merge branch 'master' into gtk3

audacious-media-player · Dec 5, 2014 · 36bbe13 · 36bbe13
2 parents 7b35797 + 96c8dee
commit 36bbe13
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git 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])

diff --git 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;
 

diff --git 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
@@ -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
@@ -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);
 }