dnl
dnl x86 accelerations
dnl
-if test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "x86" -o "${host_cpu}" = "i386" -o "${host_cpu}"="i486" -o "${host_cpu}" = "x86_64"
+if test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "x86" -o "${host_cpu}" = "i386" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "x86_64"
then
ARCH="${ARCH} mmx"
VLC_ADD_PLUGINS([${ACCEL_MODULES}])
# update status display
def update(widget):
- item = tracklist.GetMetadata(tracklist.GetCurrentTrack())
+ Track = player.GetMetadata()
vol.set_value(player.VolumeGet())
try:
- a = item["artist"]
- except: a = ""
+ a = Track["artist"]
+ except:
+ a = ""
try:
- t = item["title"]
- except: t = ""
+ t = Track["title"]
+ except:
+ t = ""
if t == "":
try:
- t = item["URI"]
+ t = Track["URI"]
except:
t = ""
l_artist.set_text(a)
l_title.set_text(t)
+ try:
+ length = Track["length"]
+ except:
+ length = 0
+ if length > 0:
+ time_s.set_range(0,Track["length"])
+ time_s.set_sensitive(True)
+ else:
+ # disable the position scale if length isn't available
+ time_s.set_sensitive(False)
GetPlayStatus(0)
# callback for volume change
def timeset():
global playing
if playing == True:
- time_s.set_value(player.PositionGet())
+ try:
+ time_s.set_value(player.PositionGet())
+ except:
+ playing = False
return True
# toggle simple/full display
dbus_bool_t b_random;
vlc_value_t val;
playlist_t* p_playlist = NULL;
-
+
dbus_error_init( &error );
dbus_message_get_args( p_from, &error,
DBUS_TYPE_BOOLEAN, &b_random,
DBUS_TYPE_INVALID );
-
+
if( dbus_error_is_set( &error ) )
{
msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
}
val.b_bool = ( b_random == TRUE ) ? VLC_TRUE : VLC_FALSE ;
-
+
p_playlist = pl_Yield( (vlc_object_t*) p_this );
var_Set ( p_playlist, "random", val );
pl_Release( ((vlc_object_t*) p_this) );
/*****************************************************************************
* rc.c : remote control stdin/stdout module for vlc
*****************************************************************************
- * Copyright (C) 2004 - 2005 the VideoLAN team
+ * Copyright (C) 2004-2007 the VideoLAN team
* $Id$
*
* Author: Peter Surda <shurdeek@panorama.sth.ac.at>
}
#endif
- while( !intf_ShouldDie( p_intf ) && *pi_size < MAX_LINE_LENGTH &&
- (i_read = net_Read( p_intf, p_intf->p_sys->i_socket == -1 ?
- 0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL,
- (uint8_t *)p_buffer + *pi_size, 1, VLC_FALSE ) ) > 0 )
+ int i_socket = p_intf->p_sys->i_socket == -1 ? 0 : p_intf->p_sys->i_socket;
+ /* 0 == STDIN_FILENO */
+
+ while( !intf_ShouldDie( p_intf ) && *pi_size < MAX_LINE_LENGTH )
{
- if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
- break;
+ i_read = net_Read( p_intf, i_socket, NULL,
+ (uint8_t *)p_buffer + *pi_size, 1, VLC_FALSE );
+
+ if( i_read > 0 )
+ {
+ if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )
+ break;
- (*pi_size)++;
+ (*pi_size)++;
+ }
+ else if( i_read == 0 )
+ break;
+ else if( errno != EINTR )
+ /* we try again if a system call was interrupted */
+ break;
}
/* Connection closed */
/*****************************************************************************
* notify.c : libnotify notification plugin
*****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2007 the VideoLAN team
* $Id$
*
* Authors: Christophe Mutricy <xtophe -at- videolan -dot- org>
#if defined(WIN32) || defined(UNDER_CE)
WSASetLastError (WSAEINTR);
#else
+ if( p_this->b_die ) printf("b_die\n");
+ else printf("p_libvlc->b_die\n");
errno = EINTR;
#endif
goto error;