# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_access.h>
#include <errno.h>
static int mms_ReceivePacket( access_t * );
+static void KeepAliveThread( vlc_object_t *p_this );
int MMSTUOpen( access_t *p_access )
{
p_sys->i_timeout = var_CreateGetInteger( p_access, "mms-timeout" );
+ vlc_mutex_init( &p_sys->lock_netwrite );
+
/* *** Parse URL and get server addr/port and path *** */
vlc_UrlParse( &p_sys->url, p_access->psz_path, 0 );
if( p_sys->url.psz_host == NULL || *p_sys->url.psz_host == '\0' )
{
msg_Err( p_access, "invalid server name" );
vlc_UrlClean( &p_sys->url );
+ vlc_mutex_destroy( &p_sys->lock_netwrite );
free( p_sys );
return VLC_EGENERIC;
}
{
msg_Err( p_access, "cannot connect to server" );
vlc_UrlClean( &p_sys->url );
+ vlc_mutex_destroy( &p_sys->lock_netwrite );
free( p_sys );
return VLC_EGENERIC;
}
MMSTUClose ( p_access );
return VLC_EGENERIC;
}
+
+ /* Keep the connection alive when paused */
+ p_sys->p_keepalive_thread = vlc_object_create( p_access, sizeof( mmstu_keepalive_thread_t ) );
+ p_sys->p_keepalive_thread->p_access = p_access;
+ p_sys->p_keepalive_thread->b_paused = false;
+ p_sys->p_keepalive_thread->b_thread_error = false;
+ if( vlc_thread_create( p_sys->p_keepalive_thread, "mmstu keepalive thread", KeepAliveThread,
+ VLC_THREAD_PRIORITY_LOW, false) )
+ p_sys->p_keepalive_thread->b_thread_error = true;
+
return VLC_SUCCESS;
}
{
access_sys_t *p_sys = p_access->p_sys;
+ vlc_object_kill( p_sys->p_keepalive_thread );
+ if( !p_sys->p_keepalive_thread->b_thread_error )
+ vlc_thread_join( p_sys->p_keepalive_thread );
+ vlc_object_release( p_sys->p_keepalive_thread );
+
/* close connection with server */
MMSClose( p_access );
/* free memory */
vlc_UrlClean( &p_sys->url );
+ vlc_mutex_destroy( &p_sys->lock_netwrite );
free( p_sys );
}
{
access_sys_t *p_sys = p_access->p_sys;
bool *pb_bool;
+ bool b_bool;
int *pi_int;
int64_t *pi_64;
int i_int;
break;
case ACCESS_CAN_FASTSEEK:
- case ACCESS_CAN_PAUSE:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = false;
break;
+ case ACCESS_CAN_PAUSE:
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = true;
+ break;
+
case ACCESS_CAN_CONTROL_PACE:
pb_bool = (bool*)va_arg( args, bool* );
/* */
case ACCESS_SET_PAUSE_STATE:
+ b_bool = (bool)va_arg( args, int );
+ if( b_bool )
+ {
+ MMSStop( p_access );
+ vlc_object_lock( p_sys->p_keepalive_thread );
+ p_sys->p_keepalive_thread->b_paused = true;
+ vlc_object_unlock( p_sys->p_keepalive_thread );
+ }
+ else
+ {
+ Seek( p_access, p_access->info.i_pos );
+ vlc_object_lock( p_sys->p_keepalive_thread );
+ p_sys->p_keepalive_thread->b_paused = false;
+ vlc_object_unlock( p_sys->p_keepalive_thread );
+ }
+ break;
+
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
var_buffer_free( &buffer );
- while( !p_access->b_die )
+ while( vlc_object_alive (p_access) )
{
if( mms_HeaderMediaRead( p_access, MMS_PACKET_CMD ) < 0 )
{
}
}
- while( !p_access->b_die )
+ while( vlc_object_alive (p_access) )
{
if( mms_HeaderMediaRead( p_access, MMS_PACKET_CMD ) < 0 )
{
size_t i_data;
size_t i_copy;
+ if( p_access->info.b_eof )
+ {
+ return 0;
+ }
+
i_data = 0;
/* *** now send data if needed *** */
int i;
int i_streams;
int i_first;
+ char *mediapath;
/* *** Open a TCP connection with server *** */
/* *** send command 5 : media file name/path requested *** */
var_buffer_reinitwrite( &buffer, 0 );
var_buffer_add64( &buffer, 0 );
- var_buffer_addUTF16( &buffer, p_url->psz_path );
+
+ /* media file path shouldn't start with / character */
+ mediapath = p_url->psz_path;
+ if ( *mediapath == '/' )
+ {
+ mediapath++;
+ }
+ var_buffer_addUTF16( &buffer, mediapath );
mms_CommandSend( p_access,
0x05,
var_buffer_add64( &buffer, 0 );
/* send it */
+ vlc_mutex_lock( &p_sys->lock_netwrite );
i_ret = net_Write( p_access, p_sys->i_handle_tcp, NULL, buffer.p_data,
buffer.i_data - ( 8 - ( i_data - i_data_old ) ) );
+ vlc_mutex_unlock( &p_sys->lock_netwrite );
if( i_ret != buffer.i_data - ( 8 - ( i_data - i_data_old ) ) )
{
msg_Err( p_access, "failed to send command" );
return -1;
}
- if( p_access->b_die || p_access->b_error ) return -1;
+ if( !vlc_object_alive (p_access) || p_access->b_error ) return -1;
//msg_Dbg( p_access, "NetFillBuffer: trying again (select)" );
{
int i_status;
- if( p_access->b_die )
+ if( !vlc_object_alive (p_access) )
return -1;
i_status = mms_ReceivePacket( p_access );
return -1;
}
+static void KeepAliveThread( vlc_object_t *p_this )
+{
+ mmstu_keepalive_thread_t *p_thread = (mmstu_keepalive_thread_t *) p_this;
+ access_t *p_access = p_thread->p_access;
+ bool b_paused;
+ bool b_was_paused = false;
+
+ vlc_object_lock( p_thread );
+ while( vlc_object_alive( p_thread) )
+ {
+ b_paused = p_thread->b_paused;
+
+ if( b_paused && b_was_paused )
+ mms_CommandSend( p_access, 0x1b, 0, 0, NULL, 0 );
+
+ b_was_paused = b_paused;
+ vlc_object_timedwait( p_thread, mdate() + 10000000 );
+ }
+ vlc_object_unlock( p_thread );
+}