Changeset 01993028a69da43a21962371aa35124262e73335

Timestamp:

09/09/04 00:02:48 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1094680968 +0000

git-parent:

[aadbe03cd05017077eece540db1d57bfd438308a]

git-author:

Gildas Bazin <gbazin@videolan.org> 1094680968 +0000

Message:

* modules/access/dvdnav.c: call buttonUpdate() again when the video ES is started.

Files:

• modules/access/dvdnav.c (modified) (11 diffs)

modules/access/dvdnav.c

@@ -407 +407 @@
-            ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
-            pi_int    = (int*)va_arg( args, int* );
-   
-   
+        
+        
-
-            /* Duplicate title infos */
@@ -551 +551 @@
-        break;
-    }
+
+    case DVDNAV_SPU_CLUT_CHANGE:
+    {
+        int i;
+
+        msg_Dbg( p_demux, "DVDNAV_SPU_CLUT_CHANGE" );
+        /* Update color lookup table (16 *uint32_t in packet) */
+        memcpy( p_sys->clut, packet, 16 * sizeof( uint32_t ) );
+
+        /* HACK to get the SPU tracks registered in the right order */
+        for( i = 0; i < 0x1f; i++ )
+        {
+            if( dvdnav_spu_stream_to_lang( p_sys->dvdnav, i ) != 0xffff )
+                ESNew( p_demux, 0xbd20 + i );
+        }
+        /* END HACK */
+        break;
+    }
+
-    case DVDNAV_SPU_STREAM_CHANGE:
-    {
-        dvdnav_spu_stream_change_event_t *event =
-            (dvdnav_spu_stream_change_event_t*)packet;
+        int i;
+
-        msg_Dbg( p_demux, "DVDNAV_SPU_STREAM_CHANGE" );
-        msg_Dbg( p_demux, "     - physical_wide=%d",
@@ -564 +585 @@
-
-        ESSubtitleUpdate( p_demux );
+
+        /* HACK to get the SPU tracks registered in the right order */
+        for( i = 0; i < 0x1f; i++ )
+        {
+            if( dvdnav_spu_stream_to_lang( p_sys->dvdnav, i ) != 0xffff )
+                ESNew( p_demux, 0xbd20 + i );
+        }
+        /* END HACK */
-        break;
-    }
+
-    case DVDNAV_AUDIO_STREAM_CHANGE:
-    {
@@ -575 +605 @@
-        break;
-    }
+
-    case DVDNAV_VTS_CHANGE:
-    {
@@ -616 +647 @@
-        break;
-    }
+
-    case DVDNAV_CELL_CHANGE:
-    {
@@ -660 +692 @@
-        break;
-    }
+
-    case DVDNAV_STOP:   /* EOF */
-        msg_Dbg( p_demux, "DVDNAV_STOP" );
@@ -674 +707 @@
-    }
-
-    case DVDNAV_SPU_CLUT_CHANGE:
-    {
-        int i;
-
-        msg_Dbg( p_demux, "DVDNAV_SPU_CLUT_CHANGE" );
-        /* Update color lookup table (16 *uint32_t in packet) */
-        memcpy( p_sys->clut, packet, 16 * sizeof( uint32_t ) );
-
-        /* HACK to get the SPU tracks registered in the right order */
-        for( i = 0; i < 0x1f; i++ )
-        {
-            if( dvdnav_spu_stream_to_lang( p_sys->dvdnav, i ) != 0xffff )
-                ESNew( p_demux, 0xbd20 + i );
-        }
-        /* END HACK */
-        break;
-    }
-
-    case DVDNAV_HOP_CHANNEL:
-        msg_Dbg( p_demux, "DVDNAV_HOP_CHANNEL" );
@@ -852 +867 @@
-
-    dvdnav_current_title_info( p_sys->dvdnav, &i_title, &i_part );
-
-
-
-
+
-
-    if( i_spu >= 0 && i_spu <= 0x1f )
@@ -861 +873 @@
-        ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(0xbd20 + i_spu)];
-
-
-
-
-
+
+
-        /* be sure to unselect it (reset) */
-        es_out_Control( p_demux->out, ES_OUT_SET_ES_STATE, tk->es,
@@ -982 +992 @@
-    vlc_bool_t  b_select = VLC_FALSE;
-
-
-
-
-
+
-
-    if( ps_track_fill( tk, i_id ) )
@@ -1070 +1077 @@
-    }
-    tk->b_seen = VLC_TRUE;
+
+    if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux );
-}
-