Index: callbacks.c =================================================================== RCS file: /cvsroot/liteamp/liteamp/src/callbacks.c,v retrieving revision 1.32 diff -u -r1.32 callbacks.c --- callbacks.c 10 Feb 2003 07:44:42 -0000 1.32 +++ callbacks.c 10 Feb 2003 09:30:44 -0000 @@ -490,8 +490,9 @@ void toolbar_shuffle_activate_cb( GtkToggleButton* togglebutton, gpointer data) { - g_print("toolbar_shuffle_activate\n"); gboolean shuffle = gtk_toggle_button_get_active(togglebutton); + + g_print("toolbar_shuffle_activate\n"); if(prefs.play_shuffle == shuffle) return; prefs.play_shuffle = shuffle; @@ -506,8 +507,9 @@ void toolbar_loop_activate_cb( GtkToggleButton* togglebutton, gpointer data) { - g_print("toolbar_loop_activate\n"); gboolean loop = gtk_toggle_button_get_active(togglebutton); + + g_print("toolbar_loop_activate\n"); if(prefs.play_loop == loop) return; prefs.play_loop = loop; Index: ogg-decoder.c =================================================================== RCS file: /cvsroot/liteamp/liteamp/src/ogg-decoder.c,v retrieving revision 1.20 diff -u -r1.20 ogg-decoder.c --- ogg-decoder.c 8 Feb 2003 15:19:02 -0000 1.20 +++ ogg-decoder.c 10 Feb 2003 09:30:44 -0000 @@ -285,8 +285,10 @@ gint ogg_get_cur_time() { + gint value; + pthread_mutex_lock(&(info.mutex)); - gint value = (gint)ov_time_tell(info.vf); + value = (gint)ov_time_tell(info.vf); pthread_mutex_unlock(&(info.mutex)); if (value == OV_EINVAL) return -1; @@ -295,8 +297,10 @@ gint ogg_get_cur_frame() { + gint value; + pthread_mutex_lock(&(info.mutex)); - gint value = (gint)ov_pcm_tell(info.vf); + value = (gint)ov_pcm_tell(info.vf); pthread_mutex_unlock(&(info.mutex)); if (value == OV_EINVAL) return -1;