* src/audio_output/input.c, src/audio_output/mixer.c: Fixed an annoying bug in the...

    (p_input->p_first_byte_to_mix sometimes need to be reset)
* modules/gui/wxwindows/interface.cpp: fixed the slider under wx-gtk.

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index 71426fe43bd28b8c3f72c8dd832cf345540e7f88..0bec439744da8ef8345ed381ebd2b859bf05cf37 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -2,7 +2,7 @@
  * interface.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: interface.cpp,v 1.14 2003/01/26 10:36:10 gbazin Exp $
+ * $Id: interface.cpp,v 1.15 2003/01/26 13:37:09 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -514,9 +514,11 @@ void Interface::OnSliderUpdate( wxScrollEvent& event )
 {
     vlc_mutex_lock( &p_intf->change_lock );
 
+#ifdef WIN32
     if( event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE
        || event.GetEventType() == wxEVT_SCROLL_ENDSCROLL )
     {
+#endif
        if( p_intf->p_sys->i_slider_pos != event.GetPosition()
            && p_intf->p_sys->p_input )
        {
@@ -526,6 +528,7 @@ void Interface::OnSliderUpdate( wxScrollEvent& event )
                        INPUT_SEEK_PERCENT | INPUT_SEEK_SET );
        }
 
+#ifdef WIN32
         p_intf->p_sys->b_slider_free = VLC_TRUE;
     }
     else
@@ -546,6 +549,7 @@ void Interface::OnSliderUpdate( wxScrollEvent& event )
 #undef p_area
        }
     }
+#endif
 
     vlc_mutex_unlock( &p_intf->change_lock );
 }

diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index 4f876cd13dd06df11b17843cb04b7639d4598b6d..c73f3210446bffd630c337e3a5e55a18ca7f8f1b 100644 (file)
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -2,7 +2,7 @@
  * input.c : internal management of input streams for the audio output
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: input.c,v 1.30 2003/01/16 21:14:23 babal Exp $
+ * $Id: input.c,v 1.31 2003/01/26 13:37:09 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -241,6 +241,7 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
                   "clearing out", mdate() - start_date );
         vlc_mutex_lock( &p_aout->input_fifos_lock );
         aout_FifoSet( p_aout, &p_input->fifo, 0 );
+        p_input->p_first_byte_to_mix = NULL;
         vlc_mutex_unlock( &p_aout->input_fifos_lock );
         if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE )
             msg_Warn( p_aout, "timing screwed, stopping resampling" );

diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c
index 5c66c45190628a8c96854c2bd53a9fb9193e13fa..c0938504360a90470294acb61d2f09a5648c7931 100644 (file)
--- a/src/audio_output/mixer.c
+++ b/src/audio_output/mixer.c
@@ -2,7 +2,7 @@
  * mixer.c : audio output mixing operations
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: mixer.c,v 1.24 2003/01/23 17:13:28 massiot Exp $
+ * $Id: mixer.c,v 1.25 2003/01/26 13:37:09 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -141,6 +141,7 @@ static int MixBuffer( aout_instance_t * p_aout )
                 p_buffer = aout_FifoPop( p_aout, p_fifo );
                 aout_BufferFree( p_buffer );
                 p_buffer = p_fifo->p_first;
+                p_input->p_first_byte_to_mix = NULL;
             }
 
             if ( p_buffer == NULL )