logger: don't reinvent stdio, kill a few relocations

[vlc] / modules / access / dvdnav.c

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 8554ac1bedd8cba75c04c7c7eab6ac71bb511986..5a200cbf2da6330e616db171cafdae962eb64730 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -166,6 +166,8 @@ static int ProbeDVD( demux_t *, char * );
 
 static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var );
 
+static int ControlInternal( demux_t *, int, ... );
+
 /*****************************************************************************
  * DemuxOpen:
  *****************************************************************************/
@@ -254,15 +256,19 @@ static int Open( vlc_object_t *p_this )
         msg_Warn( p_demux, "cannot set PGC positioning flag" );
     }
 
-    /* Set menu language ("en")
-     * XXX: maybe it would be better to set it like audio/spu
-     * or to create a --menu-language option */
-    if( dvdnav_menu_language_select( p_sys->dvdnav, (char*)LANGUAGE_DEFAULT ) !=
+    /* Set menu language
+     * XXX A menu-language may be better than sub-language */
+    psz_code = DemuxGetLanguageCode( p_demux, "sub-language" );
+    if( dvdnav_menu_language_select( p_sys->dvdnav, psz_code ) !=
         DVDNAV_STATUS_OK )
     {
         msg_Warn( p_demux, "can't set menu language to '%s' (%s)",
-                  LANGUAGE_DEFAULT, dvdnav_err_to_string( p_sys->dvdnav ) );
+                  psz_code, dvdnav_err_to_string( p_sys->dvdnav ) );
+        /* We try to fall back to 'en' */
+        if( strcmp( psz_code, LANGUAGE_DEFAULT ) )
+            dvdnav_menu_language_select( p_sys->dvdnav, (char*)LANGUAGE_DEFAULT );
     }
+    free( psz_code );
 
     /* Set audio language */
     psz_code = DemuxGetLanguageCode( p_demux, "audio-language" );
@@ -566,6 +572,17 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     }
 }
 
+static int ControlInternal( demux_t *p_demux, int i_query, ... )
+{
+    va_list args;
+    int     i_result;
+
+    va_start( args, i_query );
+    i_result = Control( p_demux, i_query, args );
+    va_end( args );
+
+    return i_result;
+}
 /*****************************************************************************
  * Demux:
  *****************************************************************************/
@@ -588,12 +605,18 @@ static int Demux( demux_t *p_demux )
     {
         msg_Warn( p_demux, "cannot get next block (%s)",
                   dvdnav_err_to_string( p_sys->dvdnav ) );
+        if( p_demux->info.i_title == 0 )
+        {
+            msg_Dbg( p_demux, "jumping to first title" );
+            return ControlInternal( p_demux, DEMUX_SET_TITLE, 1 ) == VLC_SUCCESS ? 1 : -1;
+        }
         return -1;
     }
 
     switch( i_event )
     {
     case DVDNAV_BLOCK_OK:   /* mpeg block */
+        p_sys->p_ev->b_still = false;
         DemuxBlock( p_demux, packet, i_len );
         break;
 
@@ -603,19 +626,18 @@ static int Demux( demux_t *p_demux )
 
     case DVDNAV_STILL_FRAME:
     {
-        /* We send a dummy mpeg2 end of sequence to force still frame display */
-        static const uint8_t buffer[] = {
-            0x00, 0x00, 0x01, 0xe0, 0x00, 0x07,
-            0x80, 0x00, 0x00,
-            0x00, 0x00, 0x01, 0xB7,
-        };
-        DemuxBlock( p_demux, buffer, sizeof(buffer) );
-
-        /* */
         dvdnav_still_event_t *event = (dvdnav_still_event_t*)packet;
         vlc_mutex_lock( &p_sys->p_ev->lock );
         if( !p_sys->p_ev->b_still )
         {
+            /* We send a dummy mpeg2 end of sequence to force still frame display */
+            static const uint8_t buffer[] = {
+                0x00, 0x00, 0x01, 0xe0, 0x00, 0x07,
+                0x80, 0x00, 0x00,
+                0x00, 0x00, 0x01, 0xB7,
+            };
+            DemuxBlock( p_demux, buffer, sizeof(buffer) );
+
             msg_Dbg( p_demux, "DVDNAV_STILL_FRAME" );
             msg_Dbg( p_demux, "     - length=0x%x", event->length );
             p_sys->p_ev->b_still = true;
@@ -837,12 +859,18 @@ static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var )
     char *p;
 
     psz_lang = var_CreateGetString( p_demux, psz_var );
+    if( !psz_lang )
+        return strdup(LANGUAGE_DEFAULT);
+
     /* XXX: we will use only the first value
      * (and ignore other ones in case of a list) */
-    if( ( p = strchr( psz_lang, ',' ) ) ) *p = '\0';
+    if( ( p = strchr( psz_lang, ',' ) ) )
+        *p = '\0';
 
     for( pl = p_languages; pl->psz_iso639_1 != NULL; pl++ )
     {
+        if( *psz_lang == '\0' )
+            continue;
         if( !strcasecmp( pl->psz_eng_name, psz_lang ) ||
             !strcasecmp( pl->psz_native_name, psz_lang ) ||
             !strcasecmp( pl->psz_iso639_1, psz_lang ) ||
@@ -1143,7 +1171,10 @@ static void ESNew( demux_t *p_demux, int i_id )
     {
         switch( p_sys->i_aspect )
         {
-            /* TODO Any docs somewhere ? */
+        case 1: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR; break;
+        case 2: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 4 / 3; break;
+        case 3: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 16 / 9; break;
+        case 4: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 221 / 10; break;
         default:
             tk->fmt.video.i_aspect = 0;
             break;
@@ -1242,6 +1273,8 @@ static void* EventThread( vlc_object_t *p_this )
     p_ev->i_key_action = 0;
     p_ev->b_still   = false;
 
+    int canc = vlc_savecancel ();
+
     /* catch all key event */
     var_AddCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev );
 
@@ -1272,8 +1305,8 @@ static void* EventThread( vlc_object_t *p_this )
                 break;
             case ACTIONID_NAV_ACTIVATE:
                 b_activated = true;
-                dvdnav_button_activate( p_sys->dvdnav, pci );
                 ButtonUpdate( p_ev->p_demux, true );
+                dvdnav_button_activate( p_sys->dvdnav, pci );
                 break;
             default:
                 break;
@@ -1300,9 +1333,9 @@ static void* EventThread( vlc_object_t *p_this )
             if( p_ev->b_clicked )
             {
                 b_activated = true;
+                ButtonUpdate( p_ev->p_demux, true );
                 dvdnav_mouse_activate( p_sys->dvdnav, pci, valx.i_int,
                                        valy.i_int );
-                ButtonUpdate( p_ev->p_demux, true );
             }
 
             p_ev->b_moved = false;
@@ -1352,7 +1385,7 @@ static void* EventThread( vlc_object_t *p_this )
         vlc_object_release( p_vout );
     }
     var_DelCallback( p_ev->p_libvlc, "key-action", EventKey, p_ev );
-
+    vlc_restorecancel (canc);
     vlc_mutex_destroy( &p_ev->lock );
 
     return NULL;