1 --- vlc-0.8.1/modules/gui/pda/pda.c 2004-11-06 17:35:18.000000000 +0100
2 +++ vlc-0.8.1.mod/modules/gui/pda/pda.c 2005-03-11 13:56:52.000000000 +0100
5 input_thread_t *p_input = p_intf->p_sys->p_input;
7 - vlc_mutex_lock( &p_input->stream.stream_lock );
8 + vlc_mutex_lock( &p_input->object_lock );
11 - /* New input or stream map change */
12 - if( p_input->stream.b_changed )
13 + /* New input or stream map change */
14 +/* if( p_input->stream.b_changed )
17 playlist_t *p_playlist;
22 /* Manage the slider */
23 -#define p_area p_input->stream.p_selected_area
25 +#define p_area p_input->p_selected_area
27 if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
29 /* Manage the slider for CPU_CAPABILITY_FPU hardware */
30 - if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
31 +/* if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )*/
32 + if (p_intf->p_sys->b_playing)
34 float newvalue = p_intf->p_sys->p_adj->value;
37 double f_pos = (double)newvalue / 100.0;
39 /* release the lock to be able to seek */
40 - vlc_mutex_unlock( &p_input->stream.stream_lock );
41 + vlc_mutex_unlock( &p_input->object_lock );
42 var_SetFloat( p_input, "position", f_pos );
43 - vlc_mutex_lock( &p_input->stream.stream_lock );
44 + vlc_mutex_lock( &p_input->object_lock );
46 /* Update the old value */
47 p_intf->p_sys->f_adj_oldvalue = newvalue;
51 /* Manage the slider without CPU_CAPABILITY_FPU hardware */
52 - if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
53 +/* if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )*/
54 + if (p_intf->p_sys->b_playing)
56 off_t newvalue = p_intf->p_sys->p_adj->value;
59 double f_pos = (double)newvalue / 100.0;
61 /* release the lock to be able to seek */
62 - vlc_mutex_unlock( &p_input->stream.stream_lock );
63 + vlc_mutex_unlock( &p_input->object_lock );
64 var_SetFloat( p_input, "position", f_pos );
65 - vlc_mutex_lock( &p_input->stream.stream_lock );
66 + vlc_mutex_lock( &p_input->object_lock );
68 /* Update the old value */
69 p_intf->p_sys->i_adj_oldvalue = newvalue;
76 - vlc_mutex_unlock( &p_input->stream.stream_lock );
77 + vlc_mutex_unlock( &p_input->object_lock );
79 else if( p_intf->p_sys->b_playing && !p_intf->b_die )
82 if( p_intf->p_sys->p_input )
84 /* initialize and show slider for seekable streams */
85 - if( p_intf->p_sys->p_input->stream.b_seekable )
86 +/* if( p_intf->p_sys->p_input->stream.b_seekable )*/
88 gtk_widget_show( GTK_WIDGET( p_slider ) );
93 - gtk_widget_hide( GTK_WIDGET( p_slider ) );
96 /* control buttons for free pace streams */
97 - b_control = p_intf->p_sys->p_input->stream.b_pace_control;
98 + b_control = p_intf->p_sys->p_input->b_can_pace_control;
100 - p_intf->p_sys->p_input->stream.b_changed = 0;
101 +/* p_intf->p_sys->p_input->stream.b_changed = 0;*/
102 msg_Dbg( p_intf, "stream has changed, refreshing interface" );