Qt: Simple prefs Input/codec ui fixes

[vlc] / modules / demux / avi / avi.c

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 037027cc000f038bb4047396b8d2b78fc5234747..2d5de5c1defe3f479ef61edf5e7d276ccc4bda54 100644 (file)
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -57,8 +57,9 @@ static void Close( vlc_object_t * );
 
 static const int pi_index[] = {0,1,2};
 
-static const char *const ppsz_indexes[] = { N_("Ask"), N_("Always fix"),
-                                N_("Never fix") };
+static const char *const ppsz_indexes[] = { N_("Ask for action"),
+                                            N_("Always fix"),
+                                            N_("Never fix") };
 
 vlc_module_begin ()
     set_shortname( "AVI" )
@@ -67,7 +68,7 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_DEMUX )
 
-    add_bool( "avi-interleaved", 0, NULL,
+    add_bool( "avi-interleaved", false, NULL,
               INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, true )
     add_integer( "avi-index", 0, NULL,
               INDEX_TEXT, INDEX_LONGTEXT, false )
@@ -120,7 +121,7 @@ typedef struct
 
     int             i_rate;
     int             i_scale;
-    int             i_samplesize;
+    unsigned int    i_samplesize;
 
     es_out_id_t     *p_es;
 
@@ -765,7 +766,7 @@ error:
     }
     AVI_ChunkFreeRoot( p_demux->s, &p_sys->ck_root );
     free( p_sys );
-    return VLC_EGENERIC;
+    return vlc_object_alive( p_demux ) ? VLC_EGENERIC : VLC_ETIMEOUT;
 }
 
 /*****************************************************************************
@@ -819,7 +820,6 @@ static int Demux_Seekable( demux_t *p_demux )
 
     unsigned int i_track_count = 0;
     unsigned int i_track;
-    bool b_stream;
     /* cannot be more than 100 stream (dcXX or wbXX) */
     avi_track_toread_t toread[100];
 
@@ -912,8 +912,6 @@ static int Demux_Seekable( demux_t *p_demux )
         }
     }
 
-    b_stream = false;
-
     for( ;; )
     {
         avi_track_t     *tk;
@@ -1153,8 +1151,6 @@ static int Demux_Seekable( demux_t *p_demux )
             toread[i_track].i_posf = -1;
         }
 
-        b_stream = true; /* at least one read succeed */
-
         if( tk->i_cat != VIDEO_ES )
             p_frame->i_dts = p_frame->i_pts;
         else
@@ -2376,8 +2372,9 @@ static void AVI_IndexCreate( demux_t *p_demux )
             if( dialog_ProgressCancelled( p_dialog ) )
                 break;
 
-            float f_pos = (float)stream_Tell( p_demux->s ) /
-                          (float)stream_Size( p_demux->s );
+            double f_current = stream_Tell( p_demux->s );
+            double f_size    = stream_Size( p_demux->s );
+            double f_pos     = f_current / f_size;
             dialog_ProgressSet( p_dialog, NULL, f_pos );
 
             i_dialog_update = mdate();