]> git.sesse.net Git - vlc/blobdiff - modules/access/dvdread.c
Do not provide a broken language option on Linux and similar OSes
[vlc] / modules / access / dvdread.c
index 4347d7bf9fca9a1a6c22b783cbce34c810a16bed..cb60704efd3ea02bb7c8d4d0542b3f67bcd5f8b0 100644 (file)
  *****************************************************************************/
 #define ANGLE_TEXT N_("DVD angle")
 #define ANGLE_LONGTEXT N_( \
-    "Allows you to select the default DVD angle." )
+    "Default DVD angle." )
 
 #define CACHING_TEXT N_("Caching value in ms")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for DVDread streams. " \
-    "This value should be set in millisecond units." )
+    "Caching value for DVDs. " \
+    "This value should be set in milliseconds." )
 
 #define CSSMETHOD_TEXT N_("Method used by libdvdcss for decryption")
 #define CSSMETHOD_LONGTEXT N_( \
@@ -387,10 +387,10 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         }
         case DEMUX_GET_TIME:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            if( p_sys->i_mux_rate > 0 )
+            if( p_demux->info.i_title >= 0 && p_demux->info.i_title < p_sys->i_titles )
             {
-                *pi64 = (int64_t)1000000 * DVD_VIDEO_LB_LEN *
-                        p_sys->i_title_offset / 50 / p_sys->i_mux_rate;
+                *pi64 = (int64_t) dvdtime_to_time( &p_sys->p_cur_pgc->playback_time, 0 ) / 
+                        p_sys->i_title_blocks * p_sys->i_title_offset;
                 return VLC_SUCCESS;
             }
             *pi64 = 0;
@@ -398,10 +398,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_LENGTH:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            if( p_sys->i_mux_rate > 0 )
+            if( p_demux->info.i_title >= 0 && p_demux->info.i_title < p_sys->i_titles )
             {
-                *pi64 = (int64_t)1000000 * DVD_VIDEO_LB_LEN *
-                        p_sys->i_title_blocks / 50 / p_sys->i_mux_rate;
+                *pi64 = (int64_t)dvdtime_to_time( &p_sys->p_cur_pgc->playback_time, 0 );
                 return VLC_SUCCESS;
             }
             *pi64 = 0;