Changeset 1d67f7b18284ba4268998880d2e40bd4ed933dee

Timestamp:

10/26/07 11:41:18 (11 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1193391678 +0000

git-parent:

[a8de7281d4590f2562f934849de40ab6e1669d5a]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1193391678 +0000

Message:

Add snapshot command to rc interface and make snapshot-width and snapshot-height user modifiable.

Files:

• modules/control/rc.c (modified) (6 diffs)
• src/libvlc-module.c (modified) (2 diffs)
• src/video_output/vout_intf.c (modified) (5 diffs)

modules/control/rc.c

@@ -409 +409 @@
-    ADD( "vcrop", STRING, VideoConfig )
-    ADD( "vzoom", STRING, VideoConfig )
+    ADD( "snapshot", VOID, VideoConfig )
-
-    /* audio commands */
@@ -884 +885 @@
-    msg_rc(_("| vcrop [X]  . . . . . . . . . . .  set/get video crop"));
-    msg_rc(_("| vzoom [X]  . . . . . . . . . . .  set/get video zoom"));
+    msg_rc(_("| snapshot . . . . . . . . . . . . take video snapshot"));
-    msg_rc(_("| strack [X] . . . . . . . . . set/get subtitles track"));
-    msg_rc(_("| key [hotkey name] . . . . . .  simulate hotkey press"));
@@ -1635 +1637 @@
-    vout_thread_t * p_vout;
-    const char * psz_variable;
-    vlc_value_t val_name;
-    int i_error;
-
@@ -1655 +1656 @@
-        psz_variable = "aspect-ratio";
-    }
-/* if( !strcmp( psz_cmd, "vzoom" ) ) */
+if( !strcmp( psz_cmd, "vzoom" ) )
-    {
-        psz_variable = "zoom";
-    }
-
-
-
-
-
-
+
+
+
+
-
-    if( newval.psz_string && *newval.psz_string )
@@ -1680 +1679 @@
-        }
-    }
+    else  if( !strcmp( psz_cmd, "snapshot" ) )
+    {
+        i_error = var_Set( p_vout, psz_variable, newval );
+    }
-    else
-    {
-        /* get */
+        vlc_value_t val_name;
-        vlc_value_t val, text;
-        int i;
@@ -1708 +1712 @@
-            return VLC_EGENERIC;
-        }
+
+        /* Get the descriptive name of the variable */
+        var_Change( p_vout, psz_variable, VLC_VAR_GETTEXT,
+                    &val_name, NULL );
+        if( !val_name.psz_string ) val_name.psz_string = strdup(psz_variable);
-
-        msg_rc( "+----[ %s ]", val_name.psz_string );

src/libvlc-module.c

@@ -444 +444 @@
-#define SNAP_SEQUENTIAL_LONGTEXT N_( \
-    "Use sequential numbers instead of timestamps for snapshot numbering")
+
+#define SNAP_WIDTH_TEXT N_("Video snapshot width")
+#define SNAP_WIDTH_LONGTEXT N_( \
+    "You can enforce the width of the video snapshot. By default " \
+    "it will be 320 pixels." )
+
+#define SNAP_HEIGHT_TEXT N_("Video snapshot height")
+#define SNAP_HEIGHT_LONGTEXT N_( \
+    "You can enforce the height of the video snapshot. By default " \
+    "it will be 200 pixels." )
-
-#define CROP_TEXT N_("Video cropping")
@@ -1476 +1486 @@
-    add_bool( "snapshot-sequential", VLC_FALSE, NULL, SNAP_SEQUENTIAL_TEXT,
-              SNAP_SEQUENTIAL_LONGTEXT, VLC_FALSE );
+    add_integer( "snapshot-width", 320, NULL, SNAP_WIDTH_TEXT,
+                 SNAP_WIDTH_LONGTEXT, VLC_TRUE );
+    add_integer( "snapshot-height", 200, NULL, SNAP_HEIGHT_TEXT,
+                 SNAP_HEIGHT_LONGTEXT, VLC_TRUE );
-
-    set_section( N_("Window properties" ), NULL );

src/video_output/vout_intf.c

@@ -203 +203 @@
-    var_Create( p_vout, "snapshot-num", VLC_VAR_INTEGER );
-    var_SetInteger( p_vout, "snapshot-num", 1 );
+    var_Create( p_vout, "snapshot-width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Create( p_vout, "snapshot-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
-    var_Create( p_vout, "width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
@@ -517 +519 @@
-        /* FIXME: should not be hardcoded. We should be able to
-        specify the snapshot size (snapshot-width and snapshot-height). */
-320
-200
+var_GetInteger( p_vout, "snapshot-width" )
+var_GetInteger( p_vout, "snapshot-height" )
-        fmt_out.i_chroma = VLC_FOURCC( 'p','n','g',' ' );
+
-        p_block = ( block_t* ) image_Write( p_image, p_pic, &fmt_in, &fmt_out );
-        if( !p_block )
@@ -571 +574 @@
-        return VLC_SUCCESS;
-    }
-
-
-#if defined(__APPLE__) || defined(SYS_BEOS)
@@ -659 +661 @@
-     */
-    path = utf8_opendir ( (const char *)val.psz_string  );
-
-    if ( path != NULL )
-    {
@@ -1194 +1195 @@
-    return VLC_SUCCESS;
-}
-