X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmosaic.c;h=da42df8471ff25ac9018c309b71ce490d69c5846;hb=7f01046284c11de3393f7ac801e8ae97d3617a40;hp=cda74d25edbd7f75165cde54e94634eb8bd02bec;hpb=5f18b9dd6aa22cd5d3cb77aa168e13eb10ac7c26;p=vlc

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index cda74d25ed..da42df8471 100644
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -101,11 +101,11 @@ struct filter_sys_t
 #define YOFFSET_TEXT N_("Top left corner Y coordinate")
 #define YOFFSET_LONGTEXT N_("Y Coordinate of the top-left corner of the mosaic.")
 #define VBORDER_TEXT N_("Vertical border width")
-#define VBORDER_LONGTEXT N_( "With in pixels of the border than can be drawn " \
-        "vertically around the mosaic" )
+#define VBORDER_LONGTEXT N_( "Width in pixels of the border than can be "\
+    "drawn vertically around the mosaic." )
 #define HBORDER_TEXT N_("Horizontal border width")
-#define HBORDER_LONGTEXT N_( "With in pixels of the border than can be drawn " \
-        "horizontally around the mosaic" )
+#define HBORDER_LONGTEXT N_( "Width in pixels of the border than can "\
+    "be drawn horizontally around the mosaic." )
 
 #define ALIGN_TEXT N_("Mosaic alignment" )
 #define ALIGN_LONGTEXT N_( \
@@ -118,6 +118,7 @@ struct filter_sys_t
         "automatically choose the best number of rows and columns. " \
         "fixed: use the user-defined number of rows and columns.")
 
+/// \bug [String] missing closing parenthesis
 #define ROWS_TEXT N_("Number of rows")
 #define ROWS_LONGTEXT N_("Number of image rows in the mosaic (only used if "\
         "positionning method is set to \"fixed\"." )
@@ -295,6 +296,9 @@ static int CreateFilter( vlc_object_t *p_this )
     p_sys->ppsz_order = NULL;
     psz_order = var_CreateGetString( p_filter, "mosaic-order" );
 
+    var_Create( p_libvlc, "mosaic-order", VLC_VAR_STRING);
+    var_AddCallback( p_libvlc, "mosaic-order", MosaicCallback, p_sys );
+
     if( psz_order[0] != 0 )
     {
         char *psz_end = NULL;
@@ -758,7 +762,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
     if( !strcmp( psz_var, "mosaic-alpha" ) )
     {
         vlc_mutex_lock( &p_sys->lock );
-        msg_Dbg( p_this, "Changing alpha from %d/255 to %d/255",
+        msg_Dbg( p_this, "changing alpha from %d/255 to %d/255",
                          p_sys->i_alpha, newval.i_int);
         p_sys->i_alpha = __MIN( __MAX( newval.i_int, 0 ), 255 );
         vlc_mutex_unlock( &p_sys->lock );
@@ -766,7 +770,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
     else if( !strcmp( psz_var, "mosaic-height" ) )
     {
         vlc_mutex_lock( &p_sys->lock );
-        msg_Dbg( p_this, "Changing height from %dpx to %dpx",
+        msg_Dbg( p_this, "changing height from %dpx to %dpx",
                           p_sys->i_height, newval.i_int );
         p_sys->i_height = __MAX( newval.i_int, 0 );
         vlc_mutex_unlock( &p_sys->lock );
@@ -774,7 +778,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
     else if( !strcmp( psz_var, "mosaic-width" ) )
     {
         vlc_mutex_lock( &p_sys->lock );
-        msg_Dbg( p_this, "Changing width from %dpx to %dpx",
+        msg_Dbg( p_this, "changing width from %dpx to %dpx",
                          p_sys->i_width, newval.i_int );
         p_sys->i_width = __MAX( newval.i_int, 0 );
         vlc_mutex_unlock( &p_sys->lock );
@@ -782,7 +786,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
     else if( !strcmp( psz_var, "mosaic-xoffset" ) )
     {
         vlc_mutex_lock( &p_sys->lock );
-        msg_Dbg( p_this, "Changing x offset from %dpx to %dpx",
+        msg_Dbg( p_this, "changing x offset from %dpx to %dpx",
                          p_sys->i_xoffset, newval.i_int );
         p_sys->i_xoffset = __MAX( newval.i_int, 0 );
         vlc_mutex_unlock( &p_sys->lock );
@@ -790,7 +794,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
     else if( !strcmp( psz_var, "mosaic-yoffset" ) )
     {
         vlc_mutex_lock( &p_sys->lock );
-        msg_Dbg( p_this, "Changing y offset from %dpx to %dpx",
+        msg_Dbg( p_this, "changing y offset from %dpx to %dpx",
                          p_sys->i_yoffset, newval.i_int );
         p_sys->i_yoffset = __MAX( newval.i_int, 0 );
         vlc_mutex_unlock( &p_sys->lock );
@@ -804,7 +808,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
             newval.i_int = 5;
         while( pi_align_values[i_old] != p_sys->i_align ) i_old++;
         while( pi_align_values[i_new] != newval.i_int ) i_new++;
-        msg_Dbg( p_this, "Changing alignment from %d (%s) to %d (%s)",
+        msg_Dbg( p_this, "changing alignment from %d (%s) to %d (%s)",
                      p_sys->i_align, ppsz_align_descriptions[i_old],
                      newval.i_int, ppsz_align_descriptions[i_new] );
         p_sys->i_align = newval.i_int;
@@ -813,7 +817,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
     else if( !strcmp( psz_var, "mosaic-vborder" ) )
     {
         vlc_mutex_lock( &p_sys->lock );
-        msg_Dbg( p_this, "Changing vertical border from %dpx to %dpx",
+        msg_Dbg( p_this, "changing vertical border from %dpx to %dpx",
                          p_sys->i_vborder, newval.i_int );
         p_sys->i_vborder = __MAX( newval.i_int, 0 );
         vlc_mutex_unlock( &p_sys->lock );
@@ -821,7 +825,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
     else if( !strcmp( psz_var, "mosaic-hborder" ) )
     {
         vlc_mutex_lock( &p_sys->lock );
-        msg_Dbg( p_this, "Changing horizontal border from %dpx to %dpx",
+        msg_Dbg( p_this, "changing horizontal border from %dpx to %dpx",
                          p_sys->i_vborder, newval.i_int );
         p_sys->i_hborder = __MAX( newval.i_int, 0 );
         vlc_mutex_unlock( &p_sys->lock );
@@ -835,7 +839,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
         else
         {
             vlc_mutex_lock( &p_sys->lock );
-            msg_Dbg( p_this, "Changing position method from %d (%s) to %d (%s)",
+            msg_Dbg( p_this, "changing position method from %d (%s) to %d (%s)",
                              p_sys->i_position, ppsz_pos_descriptions[p_sys->i_position],
                              newval.i_int, ppsz_pos_descriptions[newval.i_int]);
             p_sys->i_position = newval.i_int;
@@ -845,7 +849,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
     else if( !strcmp( psz_var, "mosaic-rows" ) )
     {
         vlc_mutex_lock( &p_sys->lock );
-        msg_Dbg( p_this, "Changing number of rows from %d to %d",
+        msg_Dbg( p_this, "changing number of rows from %d to %d",
                          p_sys->i_rows, newval.i_int );
         p_sys->i_rows = __MAX( newval.i_int, 1 );
         vlc_mutex_unlock( &p_sys->lock );
@@ -853,22 +857,59 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var,
     else if( !strcmp( psz_var, "mosaic-cols" ) )
     {
         vlc_mutex_lock( &p_sys->lock );
-        msg_Dbg( p_this, "Changing number of columns from %d to %d",
+        msg_Dbg( p_this, "changing number of columns from %d to %d",
                          p_sys->i_cols, newval.i_int );
         p_sys->i_cols = __MAX( newval.i_int, 1 );
         vlc_mutex_unlock( &p_sys->lock );
     }
+    else if( !strcmp( psz_var, "mosaic-order" ) )
+    {
+        char *psz_order;
+        int i_index;
+        vlc_mutex_lock( &p_sys->lock );
+        msg_Dbg( p_this, "Changing mosaic order to %s", newval.psz_string );
+
+        p_sys->i_order_length = 0;
+        p_sys->ppsz_order = NULL;
+        psz_order = newval.psz_string;
+
+        while( p_sys->i_order_length-- )
+        {
+#if 0
+            printf("%d\n", p_sys->ppsz_order);
+#endif
+            free( p_sys->ppsz_order );
+        }
+        if( psz_order[0] != 0 )
+        {
+            char *psz_end = NULL;
+            i_index = 0;
+            do
+            {
+                psz_end = strchr( psz_order, ',' );
+                i_index++;
+                p_sys->ppsz_order = realloc( p_sys->ppsz_order,
+                                    i_index * sizeof(char *) );
+                p_sys->ppsz_order[i_index - 1] = strndup( psz_order,
+                                           psz_end - psz_order );
+                psz_order = psz_end+1;
+            } while( NULL !=  psz_end );
+            p_sys->i_order_length = i_index;
+        }
+
+        vlc_mutex_unlock( &p_sys->lock );
+    }
     else if( !strcmp( psz_var, "mosaic-keep-aspect-ratio" ) )
     {
         vlc_mutex_lock( &p_sys->lock );
         if( newval.i_int )
         {
-            msg_Dbg( p_this, "Keep aspect ratio" );
+            msg_Dbg( p_this, "keeping aspect ratio" );
             p_sys->b_ar = 1;
         }
         else
         {
-            msg_Dbg( p_this, "Don't keep aspect ratio" );
+            msg_Dbg( p_this, "won't keep aspect ratio" );
             p_sys->b_ar = 0;
         }
         vlc_mutex_unlock( &p_sys->lock );