Control interfaces first string review.

[vlc] / modules / control / gestures.c

diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index b2d755c9fd848bb9f15eb9f562d7c9d2f8d9545d..c95a434d60bcf7cde5fb317d6cf3f475987abb75 100644 (file)
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@ -76,8 +76,7 @@ static void RunIntf        ( intf_thread_t *p_intf );
  *****************************************************************************/
 #define THRESHOLD_TEXT N_( "Motion threshold (10-100)" )
 #define THRESHOLD_LONGTEXT N_( \
-    "Amount of movement required for a mouse" \
-    " gesture to be recorded." )
+    "Amount of movement required for a mouse gesture to be recorded." )
 
 #define BUTTON_TEXT N_( "Trigger button" )
 #define BUTTON_LONGTEXT N_( \
@@ -90,7 +89,8 @@ vlc_module_begin();
     set_shortname( _("Gestures"));
     set_category( CAT_INTERFACE );
     set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    add_integer( "gestures-threshold", 30, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE );
+    add_integer( "gestures-threshold", 30, NULL,
+                 THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE );
     add_string( "gestures-button", "right", NULL,
                 BUTTON_TEXT, BUTTON_LONGTEXT, VLC_FALSE );
         change_string_list( button_list, button_list_text, 0 );
@@ -126,7 +126,7 @@ static int gesture( int i_pattern, int i_num )
 {
     return ( i_pattern >> ( i_num * 4 ) ) & 0xF;
 }
-        
+
 /*****************************************************************************
  * CloseIntf: destroy dummy interface
  *****************************************************************************/
@@ -149,17 +149,17 @@ static void RunIntf( intf_thread_t *p_intf )
 
     if( InitThread( p_intf ) < 0 )
     {
-        msg_Err( p_intf, "can't initialize intf" );
+        msg_Err( p_intf, "can't initialize intferface thread" );
         return;
     }
-    msg_Dbg( p_intf, "intf initialized" );
+    msg_Dbg( p_intf, "interface thread initialized" );
 
     /* Main loop */
     while( !p_intf->b_die )
     {
         vlc_mutex_lock( &p_intf->change_lock );
 
-        /* 
+        /*
          * mouse cursor
          */
         if( p_intf->p_sys->b_got_gesture )
@@ -174,7 +174,7 @@ static void RunIntf( intf_thread_t *p_intf )
                 {
                     break;
                 }
-                
+
                 playlist_Prev( p_playlist );
                 vlc_object_release( p_playlist );
                 break;
@@ -185,7 +185,7 @@ static void RunIntf( intf_thread_t *p_intf )
                 {
                     break;
                 }
-                
+
                 playlist_Next( p_playlist );
                 vlc_object_release( p_playlist );
                 break;
@@ -201,7 +201,7 @@ static void RunIntf( intf_thread_t *p_intf )
                 p_intf->p_vlc->b_die = VLC_TRUE;
                 break;
             case GESTURE(DOWN,LEFT,UP,RIGHT):
-                msg_Dbg(p_intf, "a square!" );
+                msg_Dbg(p_intf, "a square was drawn!" );
                 break;
             default:
                 break;
@@ -210,11 +210,11 @@ static void RunIntf( intf_thread_t *p_intf )
             p_intf->p_sys->i_pattern = 0;
             p_intf->p_sys->b_got_gesture = VLC_FALSE;
         }
-                
+
 
         vlc_mutex_unlock( &p_intf->change_lock );
 
-        /* 
+        /*
          * video output
          */
         if( p_intf->p_sys->p_vout && p_intf->p_sys->p_vout->b_die )
@@ -272,7 +272,8 @@ static int InitThread( intf_thread_t * p_intf )
         p_intf->p_sys->p_input = p_input;
         p_intf->p_sys->b_got_gesture = VLC_FALSE;
         p_intf->p_sys->b_button_pressed = VLC_FALSE;
-        p_intf->p_sys->i_threshold = config_GetInt( p_intf, "gestures-threshold" );
+        p_intf->p_sys->i_threshold =
+                     config_GetInt( p_intf, "gestures-threshold" );
         psz_button = config_GetPsz( p_intf, "gestures-button" );
         if ( !strcmp( psz_button, "left" ) )
         {
@@ -307,17 +308,19 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
 {
     vlc_value_t val;
     int pattern = 0;
-    
+
     signed int i_horizontal, i_vertical;
     intf_thread_t *p_intf = (intf_thread_t *)p_data;
 
     /* don't process new gestures before the last events are processed */
-    if( p_intf->p_sys->b_got_gesture ) {
+    if( p_intf->p_sys->b_got_gesture )
+    {
         return VLC_SUCCESS;
     }
 
     vlc_mutex_lock( &p_intf->change_lock );
-    if( !strcmp(psz_var, "mouse-moved" ) && p_intf->p_sys->b_button_pressed ) {
+    if( !strcmp(psz_var, "mouse-moved" ) && p_intf->p_sys->b_button_pressed )
+    {
         var_Get( p_intf->p_sys->p_vout, "mouse-x", &val );
         p_intf->p_sys->i_mouse_x = val.i_int;
         var_Get( p_intf->p_sys->p_vout, "mouse-y", &val );
@@ -328,40 +331,43 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
         i_vertical = p_intf->p_sys->i_mouse_y
             - p_intf->p_sys->i_last_y;
         i_vertical = i_vertical / p_intf->p_sys->i_threshold;
-        
-        if ( i_horizontal < 0 )
+
+        if( i_horizontal < 0 )
         {
-            msg_Dbg( p_intf, "left gesture(%d)", i_horizontal );
+            msg_Dbg( p_intf, "left gesture (%d)", i_horizontal );
             pattern = LEFT;
         }
-        else if ( i_horizontal > 0 )
+        else if( i_horizontal > 0 )
         {
-            msg_Dbg( p_intf, "right gesture(%d)", i_horizontal );
+            msg_Dbg( p_intf, "right gesture (%d)", i_horizontal );
             pattern = RIGHT;
         }
-        if ( i_vertical < 0 )
+        if( i_vertical < 0 )
         {
-            msg_Dbg( p_intf, "up gesture(%d)", i_vertical );
+            msg_Dbg( p_intf, "up gesture (%d)", i_vertical );
             pattern = UP;
         }
-        else if ( i_vertical > 0 )
+        else if( i_vertical > 0 )
         {
-            msg_Dbg( p_intf, "down gesture(%d)", i_vertical );
+            msg_Dbg( p_intf, "down gesture (%d)", i_vertical );
             pattern = DOWN;
         }
-        if (pattern )
+        if( pattern )
         {
             p_intf->p_sys->i_last_y = p_intf->p_sys->i_mouse_y;
             p_intf->p_sys->i_last_x = p_intf->p_sys->i_mouse_x;
-            if( gesture(p_intf->p_sys->i_pattern, p_intf->p_sys->i_num_gestures - 1 ) != pattern )
+            if( gesture( p_intf->p_sys->i_pattern,
+                         p_intf->p_sys->i_num_gestures - 1 ) != pattern )
             {
-                p_intf->p_sys->i_pattern |= pattern << ( p_intf->p_sys->i_num_gestures * 4 );
+                p_intf->p_sys->i_pattern |=
+                    pattern << ( p_intf->p_sys->i_num_gestures * 4 );
                 p_intf->p_sys->i_num_gestures++;
             }
         }
 
     }
-    if( !strcmp( psz_var, "mouse-button-down" ) && newval.i_int & p_intf->p_sys->i_button_mask
+    if( !strcmp( psz_var, "mouse-button-down" )
+        && newval.i_int & p_intf->p_sys->i_button_mask
         && !p_intf->p_sys->b_button_pressed )
     {
         p_intf->p_sys->b_button_pressed = VLC_TRUE;
@@ -370,7 +376,8 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
         var_Get( p_intf->p_sys->p_vout, "mouse-y", &val );
         p_intf->p_sys->i_last_y = val.i_int;
     }
-    if( !strcmp( psz_var, "mouse-button-down" ) && !( newval.i_int & p_intf->p_sys->i_button_mask )
+    if( !strcmp( psz_var, "mouse-button-down" )
+        && !( newval.i_int & p_intf->p_sys->i_button_mask )
         && p_intf->p_sys->b_button_pressed )
     {
         p_intf->p_sys->b_button_pressed = VLC_FALSE;