[vlc-devel] [PATCH] Added hotkey for video transformation. Pressing Ctrl+Alt+r the user can navigate through the available transformation modes.
Stefanos Orovas
stef.orovas at gmail.com
Sat Jan 18 17:22:04 CET 2014
---
include/vlc_keys.h | 2 ++
modules/control/hotkeys.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
src/config/keys.c | 1 +
src/libvlc-module.c | 8 ++++++++
4 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index aafa589..027c812 100644
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -211,6 +211,8 @@ typedef enum vlc_action {
ACTIONID_ZOOM_DOUBLE,
/* Cycle Through Audio Devices */
ACTIONID_AUDIODEVICE_CYCLE,
+ /* Transforming */
+ ACTIONID_TRANSFORM,
/* scaling */
ACTIONID_TOGGLE_AUTOSCALE,
ACTIONID_SCALE_UP,
diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index ab68340..51ad890 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -836,7 +836,50 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
if( p_vout )
var_DecInteger( p_vout, "crop-right" );
break;
-
+ case ACTIONID_TRANSFORM:
+ if ( p_vout )
+ {
+ char *psz_parser, *transform_type = "";
+ char *psz_string = config_GetPsz( p_vout, "video-filter" );
+ static int tr_mode = 0;
+
+ if ( !psz_string ) psz_string = strdup( "" );
+ psz_parser = strstr( psz_string, "transform" );
+
+ if ( !psz_parser ){
+ psz_parser = psz_string;
+ asprintf( &psz_string, ( *psz_string ) ? "%s:%s" : "%s%s", psz_string, "transform" );
+ }
+
+ switch( tr_mode ){
+ case 0: transform_type = "90"; break;
+ case 1: transform_type = "180"; break;
+ case 2: transform_type = "270"; break;
+ case 3: transform_type = "hflip"; break;
+ case 4: transform_type = "vflip"; break;
+ case 5: transform_type = "transpose"; break;
+ case 6: transform_type = "antitranspose"; break;
+ case 7: // reset psz_string
+ if( *( psz_parser + strlen( "transform" ) ) == ':' )
+ memmove( psz_parser, psz_parser + strlen( "transform" ) + 1,
+ strlen( psz_parser + strlen( "transform" ) + 1 ) + 1 );
+ else *psz_parser = '\0';
+
+ /* Remove trailing : : */
+ size_t i_len = strlen( psz_string );
+ if( i_len > 0 && *( psz_string + i_len - 1 ) == ':' )
+ {
+ *( psz_string + i_len - 1 ) = '\0';
+ }
+ break;
+ }
+ tr_mode ++; tr_mode = tr_mode % 8;
+
+ config_PutPsz( p_intf, "transform-type", transform_type );
+ config_PutPsz( p_intf, "video-filter", psz_string );
+ var_SetString( p_vout, "video-filter", psz_string );
+ }
+ break;
case ACTIONID_TOGGLE_AUTOSCALE:
if( p_vout )
{
diff --git a/src/config/keys.c b/src/config/keys.c
index 07c0d75..8c323a4 100644
--- a/src/config/keys.c
+++ b/src/config/keys.c
@@ -358,6 +358,7 @@ static const struct action actions[] =
{ "title-prev", ACTIONID_TITLE_PREV, },
{ "toggle-autoscale", ACTIONID_TOGGLE_AUTOSCALE, },
{ "toggle-fullscreen", ACTIONID_TOGGLE_FULLSCREEN, },
+ { "transform", ACTIONID_TRANSFORM, },
{ "uncrop-bottom", ACTIONID_UNCROP_BOTTOM, },
{ "uncrop-left", ACTIONID_UNCROP_LEFT, },
{ "uncrop-right", ACTIONID_UNCROP_RIGHT, },
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 745c992..94cc950 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1320,6 +1320,9 @@ static const char *const mouse_wheel_texts[] =
#define AUDIODELAY_DOWN_KEY_TEXT N_("Audio delay down")
#define AUDIODELAY_DOWN_KEY_LONGTEXT N_("Select the key to decrease the audio delay.")
+#define TRANSFORM_TEXT N_("Transform video")
+#define TRANSFORM_LONGTEXT N_("Transforms the video.")
+
#define ZOOM_QUARTER_KEY_TEXT N_("1:4 Quarter")
#define ZOOM_HALF_KEY_TEXT N_("1:2 Half")
#define ZOOM_ORIGINAL_KEY_TEXT N_("1:1 Original")
@@ -2209,6 +2212,7 @@ vlc_module_begin ()
# define KEY_CHAPTER_PREV "Ctrl+u"
# define KEY_CHAPTER_NEXT "Ctrl+d"
# define KEY_SNAPSHOT "Command+Alt+s"
+# define KEY_TRANSFORM "Ctrl+Alt+r"
# define KEY_ZOOM "z"
# define KEY_UNZOOM "Shift+z"
# define KEY_RANDOM "Command+z"
@@ -2335,6 +2339,8 @@ vlc_module_begin ()
# define KEY_CHAPTER_NEXT "Shift+n"
# define KEY_SNAPSHOT "Shift+s"
+# define KEY_TRANSFORM "Ctrl+Alt+r"
+
# define KEY_ZOOM "z"
# define KEY_UNZOOM "Shift+z"
@@ -2543,6 +2549,8 @@ vlc_module_begin ()
RANDOM_KEY_TEXT, RANDOM_KEY_LONGTEXT, false )
add_key( "key-loop", KEY_LOOP,
LOOP_KEY_TEXT, LOOP_KEY_LONGTEXT, false )
+ add_key( "key-transform", KEY_TRANSFORM,
+ TRANSFORM_TEXT, TRANSFORM_LONGTEXT, false )
set_section ( N_("Zoom" ), NULL )
add_key( "key-zoom-quarter", KEY_ZOOM_QUARTER,
--
1.7.9.5
More information about the vlc-devel
mailing list