channels.conf demux: parse symbol-rate from playlist

[vlc] / modules / access / dv.c

diff --git a/modules/access/dv.c b/modules/access/dv.c
index ddd725f5fab36d94f5d3575552a460d25e8482ea..e0e95170c51930ec263ec6a53a9d01b3c14b807b 100644 (file)
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -70,21 +70,21 @@ static int Control( access_t *, int, va_list );
 
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
-    "Caching value for DV streams. This" \
+    "Caching value for DV streams. This " \
     "value should be set in milliseconds." )
 
-vlc_module_begin();
-    set_description( N_("Digital Video (Firewire/ieee1394)  input") );
-    set_shortname( N_("dv") );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_ACCESS );
-    add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );
-    set_capability( "access", 0 );
-    add_shortcut( "dv" );
-    add_shortcut( "dv1394" );
-    add_shortcut( "raw1394" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Digital Video (Firewire/ieee1394)  input") )
+    set_shortname( N_("dv") )
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_ACCESS )
+    add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true )
+    set_capability( "access", 0 )
+    add_shortcut( "dv" )
+    add_shortcut( "dv1394" )
+    add_shortcut( "raw1394" )
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 typedef struct
 {
@@ -97,7 +97,7 @@ typedef struct
 
 } event_thread_t;
 
-static int Raw1394EventThread( vlc_object_t * );
+static void* Raw1394EventThread( vlc_object_t * );
 static int Raw1394Handler( raw1394handle_t, int, size_t, quadlet_t * );
 
 static int Raw1394GetNumPorts( access_t *p_access );
@@ -147,7 +147,6 @@ static int Open( vlc_object_t *p_this )
     /* Set up p_access */
     access_InitFields( p_access );
     ACCESS_SET_CALLBACKS( NULL, Block, Control, NULL );
-    p_access->info.b_prebuffered = false;
 
     p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
     if( !p_sys )
@@ -218,7 +217,7 @@ static int Open( vlc_object_t *p_this )
     raw1394_start_iso_rcv( p_sys->p_raw1394, p_sys->i_channel );
 
     p_sys->raw1394_poll.fd = raw1394_get_fd( p_sys->p_raw1394 );
-    p_sys->raw1394_poll.events = POLLIN | POLLERR | POLLHUP | POLLPRI;
+    p_sys->raw1394_poll.events = POLLIN | POLLPRI;
 
     /* Update default_pts to a suitable value for udp access */
     var_Create( p_access, "dv-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
@@ -357,17 +356,16 @@ static block_t *Block( access_t *p_access )
     return p_block;
 }
 
-static int Raw1394EventThread( vlc_object_t *p_this )
+static void* Raw1394EventThread( vlc_object_t *p_this )
 {
     event_thread_t *p_ev = (event_thread_t *) p_this;
     access_t *p_access = (access_t *) p_ev->p_access;
     access_sys_t *p_sys = (access_sys_t *) p_access->p_sys;
     int result = 0;
+    int canc = vlc_savecancel ();
 
     AVCPlay( p_access, p_sys->i_node );
 
-    vlc_thread_ready( p_this );
-
     while( vlc_object_alive (p_sys->p_ev) )
     {
         while( ( result = poll( &(p_sys->raw1394_poll), 1, 200 ) ) < 0 )
@@ -377,8 +375,6 @@ static int Raw1394EventThread( vlc_object_t *p_this )
                 perror( "error: raw1394 poll" );
                 msg_Err( p_access, "retrying device raw1394" );
             }
-            if( p_sys->p_ev->b_die )
-                break;
         }
         if( !vlc_object_alive (p_sys->p_ev) )
                 break;
@@ -388,7 +384,8 @@ static int Raw1394EventThread( vlc_object_t *p_this )
     }
 
     AVCStop( p_access, p_sys->i_node );
-    return VLC_SUCCESS;
+    vlc_restorecancel (canc);
+    return NULL;
 }
 
 static int Raw1394Handler( raw1394handle_t handle, int channel, size_t length, quadlet_t *data )