Changeset 10c717090a22a161c08d4650282d6543c0e49e3d

Timestamp:

12/16/07 14:46:30 (9 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1197812790 +0000

git-parent:

[415c99dbd1498fbcc078f48693ff90bcbfff4c03]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1197812790 +0000

Message:

Some more vout_intf.c simplification and compile warning fixes.

Files:

• src/video_output/vout_intf.c (modified) (13 diffs)

src/video_output/vout_intf.c

@@ -64 +64 @@
-static int SnapshotCallback( vlc_object_t *, char const *,
-                             vlc_value_t, vlc_value_t, void * );
-
-
+
+
+
+
+
+
+
-
-/*****************************************************************************
@@ -89 +94 @@
-
-    /* Get requested coordinates */
-
-
-
-
+
+
-
-    *pi_width_hint = p_vout->i_window_width;
@@ -287 +290 @@
-        var_CreateGetInteger( p_vout, "video-title-position" );
-
-
-
-
+Show
+Timeout
+Position
-
-    /* Zoom object var */
@@ -314 +317 @@
-
-    /* Crop offset vars */
-
-
-
-
+| VLC_VAR_ISCOMMAND 
+| VLC_VAR_ISCOMMAND 
+| VLC_VAR_ISCOMMAND 
+| VLC_VAR_ISCOMMAND 
-
-    var_AddCallback( p_vout, "crop-left", CropCallback, NULL );
@@ -325 +328 @@
-
-    /* Crop object var */
-
+ VLC_VAR_ISCOMMAND |
-                VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
-
@@ -386 +389 @@
-
-    /* Aspect-ratio object var */
-
+ VLC_VAR_ISCOMMAND |
-                VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
-
@@ -418 +421 @@
-
-    /* Add a variable to indicate if the window should be on top of others */
-
+
+
-    text.psz_string = _("Always on top");
-    var_Change( p_vout, "video-on-top", VLC_VAR_SETTEXT, &text, NULL );
@@ -427 +431 @@
-
-    /* Add a fullscreen variable */
-
+Command
-    {
-        /* user requested fullscreen */
@@ -467 +471 @@
-    int i_ret;
-
-
-
+ 
+ 
-
-    var_Get( p_vout, "snapshot-path", &val );
@@ -668 +672 @@
-            do
-            {
-
-
+
+
+
+
+
+
+
+
-            }
-            while( ( p_file = utf8_fopen( psz_filename, "r" ) ) && !fclose( p_file ) );
@@ -676 +686 @@
-        else
-        {
-
-
-
-
+
+
+
+
+
+
+
+
+
-        }
-
@@ -782 +797 @@
-        {
-            psz_parser = psz_string;
-
-
+
+
+
+
+
+
-            free( psz_parser );
-        }
@@ -1177 +1196 @@
-    vout_thread_t *p_vout = (vout_thread_t *)p_this;
-    vout_Control( p_vout, VOUT_SNAPSHOT );
-    (void)psz_cmd; (void)oldval; (void)newval; (void)p_data;
-    return VLC_SUCCESS;
-}
-
-
+Show
-                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
-    vout_thread_t *p_vout = (vout_thread_t *)p_this;
-
-
-
-
-
-
-
+
-    return VLC_SUCCESS;
-}
+
+static int TitleTimeoutCallback( vlc_object_t *p_this, char const *psz_cmd,
+                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    vout_thread_t *p_vout = (vout_thread_t *)p_this;
+    p_vout->i_title_timeout = (mtime_t) newval.i_int;
+    return VLC_SUCCESS;
+}
+
+static int TitlePositionCallback( vlc_object_t *p_this, char const *psz_cmd,
+                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    vout_thread_t *p_vout = (vout_thread_t *)p_this;
+    p_vout->i_title_position = newval.i_int;
+    return VLC_SUCCESS;
+}