Changeset 315f9cd4ce80636011fb55c510a0633ddcb9201f

Timestamp:

22/11/04 10:57:50 (4 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1101117470 +0000

git-parent:

[8abeccdfe628d295c204ba18a00a0b0e86e4aed2]

git-author:

Laurent Aimar <fenrir@videolan.org> 1101117470 +0000

Message:

all: implemented INPUT_ADD_SLAVE.

Files:

• src/input/control.c (modified) (8 diffs)
• src/input/input.c (modified) (1 diff)
• src/input/input_internal.h (modified) (1 diff)

src/input/control.c

@@ -64 +64 @@
-    int64_t i_64, *pi_64;
-
+    char *psz;
+    vlc_value_t val;
+
-    switch( i_query )
-    {
@@ -280 +283 @@
-
-            return VLC_SUCCESS;
-            break;
-
-        case INPUT_CHANGE_BOOKMARK:
@@ -309 +311 @@
-
-            return VLC_SUCCESS;
-            break;
-
-        case INPUT_DEL_BOOKMARK:
@@ -343 +344 @@
-
-            return VLC_EGENERIC;
-            break;
-
-        case INPUT_GET_BOOKMARKS:
@@ -397 +397 @@
-
-            return VLC_SUCCESS;
-            break;
-
-        case INPUT_SET_BOOKMARK:
@@ -470 +469 @@
-
-            return VLC_SUCCESS;
-            break;
-        }
-
@@ -478 +476 @@
-                stream_Tell( p_input->input.p_stream );
-            return VLC_SUCCESS;
-            break;
-
-        case INPUT_SET_BYTE_SIZE:
@@ -485 +482 @@
-                stream_Size( p_input->input.p_stream );
-            return VLC_SUCCESS;
-
+
+
+
+
+
+
+
+
+
-
-        default:

src/input/input.c

@@ -1406 +1406 @@
-            break;
-
+        case INPUT_CONTROL_ADD_SLAVE:
+            if( val.psz_string )
+            {
+                input_source_t *slave = InputSourceNew( p_input );
+
+                if( !InputSourceInit( p_input, slave, val.psz_string, NULL ) )
+                {
+                    vlc_meta_t *p_meta_new = NULL;
+                    vlc_meta_t *p_meta;
+                    int64_t i_time;
+
+                    /* Add the slave */
+                    msg_Dbg( p_input, "adding %s as slave on the fly",
+                             val.psz_string );
+
+                    /* Set position */
+                    if( demux2_Control( p_input->input.p_demux,
+                                        DEMUX_GET_TIME, &i_time ) )
+                    {
+                        msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
+                        InputSourceClean( p_input, slave );
+                        free( slave );
+                        break;
+                    }
+                    if( demux2_Control( slave->p_demux,
+                                        DEMUX_SET_TIME, i_time ) )
+                    {
+                        msg_Err( p_input, "seek failed for new slave" );
+                        InputSourceClean( p_input, slave );
+                        free( slave );
+                        break;
+                    }
+
+
+                    /* Get meta (access and demux) */
+                    if( access2_Control( slave->p_access,
+                                          ACCESS_GET_META, &p_meta_new ) )
+                        p_meta_new = NULL;
+                    if( !demux2_Control( slave->p_demux,
+                                         DEMUX_GET_META, &p_meta ) )
+                    {
+                        if( p_meta_new )
+                        {
+                            vlc_meta_Merge( p_meta_new, p_meta );
+                            vlc_meta_Delete( p_meta );
+                        }
+                        else
+                        {
+                            p_meta_new = p_meta;
+                        }
+                    }
+                    /* Update meta */
+                    if( p_meta_new )
+                    {
+                        if( p_input->p_meta )
+                        {
+                            vlc_meta_Merge( p_input->p_meta, p_meta_new );
+                            vlc_meta_Delete( p_meta_new );
+                        }
+                        else
+                        {
+                            p_input->p_meta = p_meta_new;
+                        }
+                        UpdateMeta( p_input );
+                    }
+
+                    TAB_APPEND( p_input->i_slave, p_input->slave, slave );
+                }
+                else
+                {
+                    msg_Warn( p_input, "failed to add %s as slave",
+                              val.psz_string );
+                }
+
+                free( val.psz_string );
+            }
+            break;
+
-        case INPUT_CONTROL_SET_BOOKMARK:
-        default:

src/input/input_internal.h

@@ -57 +57 @@
-    INPUT_CONTROL_SET_AUDIO_DELAY,
-    INPUT_CONTROL_SET_SPU_DELAY,
+
+    INPUT_CONTROL_ADD_SLAVE,
-};
-