Changeset 1c2d8e7805f83edf1cd51f9de53eaace02b1c020

Show
Ignore:
Timestamp:
03/27/08 21:26:54 (5 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1206649614 +0200
git-parent:

[f05bd0b26dea682988321045838460e3a47836ee]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1206649614 +0200
Message:

Remove hotkeys "accounting" stuff.

That was never written to (except by KeyActionCB that _that_ was never
invoked ever, and did not make sense). Note that, had it worked as it
probably was intended, this "accounting" data should have been kept
inside the hotkeys plugin, not the libvlc instance data anyhow.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • include/main.h

    r24ddff5 r1c2d8e7  
    8080        int i_action; 
    8181        int i_key; 
    82  
    83         /* hotkey accounting information */ 
    84         mtime_t i_delta_date;/*< minimum delta time between two key presses */ 
    85         mtime_t i_last_date; /*< last date key was pressed */ 
    86         int     i_times;     /*< n times pressed within delta date*/ 
    8782    } *p_hotkeys; 
    8883}; 
  • modules/control/hotkeys.c

    rf05bd0b r1c2d8e7  
    155155        input_thread_t *p_input; 
    156156        vout_thread_t *p_last_vout; 
    157         int i_times = 0; 
    158157        int i_action = GetAction( p_intf ); 
    159158 
     
    161160            break; /* die */ 
    162161 
    163         for( i = 0; p_hotkeys[i].psz_action != NULL; i++ ) 
    164         { 
    165             if( p_hotkeys[i].i_action == i_action ) 
    166             { 
    167                 i_times  = p_hotkeys[i].i_times; 
    168                 /* times key pressed within max. delta time */ 
    169                 p_hotkeys[i].i_times = 0; 
    170                 break; 
    171             } 
    172         } 
    173   
    174162        /* Update the input */ 
    175163        PL_LOCK; 
     
    437425    i_interval = config_GetInt( p_input, a "-jump-size" ); \ 
    438426    if( i_interval > 0 ) { \ 
    439         val.i_time = ( (mtime_t)(i_interval * b) * 1000000L \ 
    440                        * ((mtime_t)(1 << i_times))); \ 
     427        val.i_time = (mtime_t)(i_interval * b) * 1000000L; \ 
    441428        var_Set( p_input, "time-offset", val ); \ 
    442429        DisplayPosition( p_intf, p_vout, p_input ); \