Linux DVB: print frequencies and symbol rates in debug

[vlc] / modules / video_filter / panoramix.c

diff --git a/modules/video_filter/panoramix.c b/modules/video_filter/panoramix.c
index 5e4cdb2caef6d8b47e42dfceb9e8689b86ebe357..dcf06d473c3d2a434032b04b25dee9cff540829d 100644 (file)
--- a/modules/video_filter/panoramix.c
+++ b/modules/video_filter/panoramix.c
@@ -68,18 +68,22 @@
 
 #define CFG_PREFIX "panoramix-"
 
+#define PANORAMIX_HELP N_("Split the video in multiple windows to " \
+    "display on a wall of screens")
+
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin()
     set_description( N_("Panoramix: wall with overlap video filter") )
     set_shortname( N_("Panoramix" ))
+    set_help(PANORAMIX_HELP)
     set_capability( "video splitter", 0 )
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_VFILTER )
 
-    add_integer( CFG_PREFIX "cols", -1, NULL, COLS_TEXT, COLS_LONGTEXT, true )
-    add_integer( CFG_PREFIX "rows", -1, NULL, ROWS_TEXT, ROWS_LONGTEXT, true )
+    add_integer( CFG_PREFIX "cols", -1, COLS_TEXT, COLS_LONGTEXT, true )
+    add_integer( CFG_PREFIX "rows", -1, ROWS_TEXT, ROWS_LONGTEXT, true )
 
 #ifdef OVERLAP
 #define LENGTH_TEXT N_("length of the overlapping area (in %)")
@@ -92,7 +96,7 @@ vlc_module_begin()
 
 #define ATTENUATION_TEXT N_("Attenuation")
 #define ATTENUATION_LONGTEXT N_("Check this option if you want attenuate blended zone by this plug-in (if option is unchecked, attenuate is made by opengl)")
-    add_bool( CFG_PREFIX "attenuate", 1, NULL, ATTENUATION_TEXT, ATTENUATION_LONGTEXT, false )
+    add_bool( CFG_PREFIX "attenuate", true, ATTENUATION_TEXT, ATTENUATION_LONGTEXT, false )
 
 #define BEGIN_TEXT N_("Attenuation, begin (in %)")
 #define BEGIN_LONGTEXT N_("Select in percent the Lagrange coeff of the beginning blended zone")
@@ -161,12 +165,12 @@ vlc_module_begin()
     add_integer_with_range( CFG_PREFIX "bz-whitelevel-green", 0, 0, 255, NULL, GGAMMA_WL_TEXT, GGAMMA_WL_LONGTEXT, true )
     add_integer_with_range( CFG_PREFIX "bz-whitelevel-blue", 0, 0, 255, NULL, BGAMMA_WL_TEXT, BGAMMA_WL_LONGTEXT, true )
 #ifndef WIN32
-    add_deprecated_alias( CFG_PREFIX "xinerama" );
+    add_obsolete_bool( CFG_PREFIX "xinerama" );
 #endif
-    add_deprecated_alias( CFG_PREFIX "offset-x" )
+    add_obsolete_bool( CFG_PREFIX "offset-x" )
 #endif
 
-    add_string( CFG_PREFIX "active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, true )
+    add_string( CFG_PREFIX "active", NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, true )
 
     add_shortcut( "panoramix" )
     set_callbacks( Open, Close )
@@ -341,9 +345,10 @@ static const panoramix_chroma_t p_chroma_array[] = {
 /* Get the number of outputs */
 static unsigned CountMonitors( vlc_object_t *obj )
 {
-    char *psz_display = var_CreateGetNonEmptyString( obj, "x11-display" );
+    char *psz_display = var_InheritString( obj, "x11-display" );
     int snum;
     xcb_connection_t *conn = xcb_connect( psz_display, &snum );
+    free( psz_display );
     if( xcb_connection_has_error( conn ) )
         return 0;
 
@@ -441,8 +446,8 @@ static int Open( vlc_object_t *p_this )
                        p_splitter->p_cfg );
 
     /* */
-    p_sys->i_col = var_CreateGetInteger( p_splitter, CFG_PREFIX "cols" );
-    p_sys->i_row = var_CreateGetInteger( p_splitter, CFG_PREFIX "rows" );
+    p_sys->i_col = var_InheritInteger( p_splitter, CFG_PREFIX "cols" );
+    p_sys->i_row = var_InheritInteger( p_splitter, CFG_PREFIX "rows" );
 
     /* Autodetect number of displays */
     if( p_sys->i_col < 0 || p_sys->i_row < 0 )
@@ -480,13 +485,13 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* */
-    p_sys->b_attenuate = var_CreateGetBool( p_splitter, CFG_PREFIX "attenuate");
-    p_sys->bz_length = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-length" );
-    p_sys->bz_height = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-height" );
-    p_sys->bz_begin = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-begin" );
-    p_sys->bz_middle = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-middle" );
-    p_sys->bz_end = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-end" );
-    p_sys->bz_middle_pos = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-middle-pos" );
+    p_sys->b_attenuate = var_InheritBool( p_splitter, CFG_PREFIX "attenuate");
+    p_sys->bz_length = var_InheritInteger( p_splitter, CFG_PREFIX "bz-length" );
+    p_sys->bz_height = var_InheritInteger( p_splitter, CFG_PREFIX "bz-height" );
+    p_sys->bz_begin = var_InheritInteger( p_splitter, CFG_PREFIX "bz-begin" );
+    p_sys->bz_middle = var_InheritInteger( p_splitter, CFG_PREFIX "bz-middle" );
+    p_sys->bz_end = var_InheritInteger( p_splitter, CFG_PREFIX "bz-end" );
+    p_sys->bz_middle_pos = var_InheritInteger( p_splitter, CFG_PREFIX "bz-middle-pos" );
     double d_p = 100.0 / p_sys->bz_middle_pos;
 
     p_sys->a_2 = d_p * p_sys->bz_begin - (double)(d_p * d_p / (d_p - 1)) * p_sys->bz_middle + (double)(d_p / (d_p - 1)) * p_sys->bz_end;
@@ -537,23 +542,23 @@ static int Open( vlc_object_t *p_this )
     {
         panoramix_gamma_t p_gamma[VOUT_MAX_PLANES];
 
-        p_gamma[0].f_gamma = var_CreateGetFloat( p_splitter, CFG_PREFIX "bz-gamma-red" );
-        p_gamma[1].f_gamma = var_CreateGetFloat( p_splitter, CFG_PREFIX "bz-gamma-green" );
-        p_gamma[2].f_gamma = var_CreateGetFloat( p_splitter, CFG_PREFIX "bz-gamma-blue" );
+        p_gamma[0].f_gamma = var_InheritFloat( p_splitter, CFG_PREFIX "bz-gamma-red" );
+        p_gamma[1].f_gamma = var_InheritFloat( p_splitter, CFG_PREFIX "bz-gamma-green" );
+        p_gamma[2].f_gamma = var_InheritFloat( p_splitter, CFG_PREFIX "bz-gamma-blue" );
 
-        p_gamma[0].f_black_crush = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-blackcrush-red" ) / 255.0;
-        p_gamma[1].f_black_crush = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-blackcrush-green" ) / 255.0;
-        p_gamma[2].f_black_crush = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-blackcrush-blue" ) / 255.0;
-        p_gamma[0].f_white_crush = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-whitecrush-red" ) / 255.0;
-        p_gamma[1].f_white_crush = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-whitecrush-green" ) / 255.0;
-        p_gamma[2].f_white_crush = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-whitecrush-blue" ) / 255.0;
+        p_gamma[0].f_black_crush = var_InheritInteger( p_splitter, CFG_PREFIX "bz-blackcrush-red" ) / 255.0;
+        p_gamma[1].f_black_crush = var_InheritInteger( p_splitter, CFG_PREFIX "bz-blackcrush-green" ) / 255.0;
+        p_gamma[2].f_black_crush = var_InheritInteger( p_splitter, CFG_PREFIX "bz-blackcrush-blue" ) / 255.0;
+        p_gamma[0].f_white_crush = var_InheritInteger( p_splitter, CFG_PREFIX "bz-whitecrush-red" ) / 255.0;
+        p_gamma[1].f_white_crush = var_InheritInteger( p_splitter, CFG_PREFIX "bz-whitecrush-green" ) / 255.0;
+        p_gamma[2].f_white_crush = var_InheritInteger( p_splitter, CFG_PREFIX "bz-whitecrush-blue" ) / 255.0;
 
-        p_gamma[0].f_black_level = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-blacklevel-red" ) / 255.0;
-        p_gamma[1].f_black_level = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-blacklevel-green" ) / 255.0;
-        p_gamma[2].f_black_level = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-blacklevel-blue" ) / 255.0;
-        p_gamma[0].f_white_level = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-whitelevel-red" ) / 255.0;
-        p_gamma[1].f_white_level = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-whitelevel-green" ) / 255.0;
-        p_gamma[2].f_white_level = var_CreateGetInteger( p_splitter, CFG_PREFIX "bz-whitelevel-blue" ) / 255.0;
+        p_gamma[0].f_black_level = var_InheritInteger( p_splitter, CFG_PREFIX "bz-blacklevel-red" ) / 255.0;
+        p_gamma[1].f_black_level = var_InheritInteger( p_splitter, CFG_PREFIX "bz-blacklevel-green" ) / 255.0;
+        p_gamma[2].f_black_level = var_InheritInteger( p_splitter, CFG_PREFIX "bz-blacklevel-blue" ) / 255.0;
+        p_gamma[0].f_white_level = var_InheritInteger( p_splitter, CFG_PREFIX "bz-whitelevel-red" ) / 255.0;
+        p_gamma[1].f_white_level = var_InheritInteger( p_splitter, CFG_PREFIX "bz-whitelevel-green" ) / 255.0;
+        p_gamma[2].f_white_level = var_InheritInteger( p_splitter, CFG_PREFIX "bz-whitelevel-blue" ) / 255.0;
 
         for( int i = 3; i < VOUT_MAX_PLANES; i++ )
         {
@@ -621,7 +626,7 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* */
-    char *psz_state = var_CreateGetNonEmptyString( p_splitter, CFG_PREFIX "active" );
+    char *psz_state = var_InheritString( p_splitter, CFG_PREFIX "active" );
 
     /* */
     bool pb_active[COL_MAX*ROW_MAX];