hotkeys.c 39.6 KB
Newer Older
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
1 2 3
/*****************************************************************************
 * hotkeys.c: Hotkey handling for vlc
 *****************************************************************************
4
 * Copyright (C) 2005 the VideoLAN team
5
 * $Id$
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
6
 *
7
 * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
8
 *          Jean-Paul Saman <jpsaman #_at_# m2x.nl>
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
9 10 11 12 13
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
14
 *
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
15 16 17 18 19 20 21
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
Antoine Cellerier's avatar
Antoine Cellerier committed
22
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
23 24 25 26 27 28
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/

29 30 31 32
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
33
#include <vlc/vlc.h>
Clément Stenac's avatar
Clément Stenac committed
34 35 36 37
#include <vlc_interface.h>
#include <vlc_input.h>
#include <vlc_vout.h>
#include <vlc_aout.h>
38
#include <vlc_osd.h>
Clément Stenac's avatar
Clément Stenac committed
39
#include <vlc_playlist.h>
Gildas Bazin's avatar
 
Gildas Bazin committed
40 41
#include "vlc_keys.h"

Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
42
#define BUFFER_SIZE 10
43 44 45 46 47 48

#define CHANNELS_NUMBER 4
#define VOLUME_TEXT_CHAN     p_intf->p_sys->p_channels[ 0 ]
#define VOLUME_WIDGET_CHAN   p_intf->p_sys->p_channels[ 1 ]
#define POSITION_TEXT_CHAN   p_intf->p_sys->p_channels[ 2 ]
#define POSITION_WIDGET_CHAN p_intf->p_sys->p_channels[ 3 ]
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
49 50 51 52 53 54 55 56 57 58 59 60
/*****************************************************************************
 * intf_sys_t: description and status of FB interface
 *****************************************************************************/
struct intf_sys_t
{
    vlc_mutex_t         change_lock;  /* mutex to keep the callback
                                       * and the main loop from
                                       * stepping on each others
                                       * toes */
    int                 p_keys[ BUFFER_SIZE ]; /* buffer that contains
                                                * keyevents */
    int                 i_size;        /* number of events in buffer */
61 62
    int                 p_channels[ CHANNELS_NUMBER ]; /* contains registered
                                                        * channel IDs */
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
63 64 65 66 67 68 69 70 71 72 73 74 75
    input_thread_t *    p_input;       /* pointer to input */
    vout_thread_t *     p_vout;        /* pointer to vout object */
};

/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
static int  Open    ( vlc_object_t * );
static void Close   ( vlc_object_t * );
static void Run     ( intf_thread_t * );
static int  GetKey  ( intf_thread_t *);
static int  KeyEvent( vlc_object_t *, char const *,
                      vlc_value_t, vlc_value_t, void * );
Gildas Bazin's avatar
 
Gildas Bazin committed
76 77
static int  ActionKeyCB( vlc_object_t *, char const *,
                         vlc_value_t, vlc_value_t, void * );
78 79
static void PlayBookmark( intf_thread_t *, int );
static void SetBookmark ( intf_thread_t *, int );
80 81 82
static void DisplayPosition( intf_thread_t *, vout_thread_t *, input_thread_t * );
static void DisplayVolume  ( intf_thread_t *, vout_thread_t *, audio_volume_t );
static void ClearChannels  ( intf_thread_t *, vout_thread_t * );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
83 84 85 86

/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
87 88 89 90 91 92 93 94 95 96 97
#define BOOKMARK1_TEXT    N_("Playlist bookmark 1")
#define BOOKMARK2_TEXT    N_("Playlist bookmark 2")
#define BOOKMARK3_TEXT    N_("Playlist bookmark 3")
#define BOOKMARK4_TEXT    N_("Playlist bookmark 4")
#define BOOKMARK5_TEXT    N_("Playlist bookmark 5")
#define BOOKMARK6_TEXT    N_("Playlist bookmark 6")
#define BOOKMARK7_TEXT    N_("Playlist bookmark 7")
#define BOOKMARK8_TEXT    N_("Playlist bookmark 8")
#define BOOKMARK9_TEXT    N_("Playlist bookmark 9")
#define BOOKMARK10_TEXT   N_("Playlist bookmark 10")
#define BOOKMARK_LONGTEXT N_("Define playlist bookmarks.")
98

Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
99
vlc_module_begin();
100
    set_shortname( _("Hotkeys") );
Anil Daoud's avatar
Anil Daoud committed
101
    set_description( _("Hotkeys management interface") );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
102 103 104 105 106 107 108 109 110 111
    set_capability( "interface", 0 );
    set_callbacks( Open, Close );
vlc_module_end();

/*****************************************************************************
 * Open: initialize interface
 *****************************************************************************/
static int Open( vlc_object_t *p_this )
{
    intf_thread_t *p_intf = (intf_thread_t *)p_this;
Clément Stenac's avatar
Woops  
Clément Stenac committed
112
    MALLOC_ERR( p_intf->p_sys, intf_sys_t );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
113 114 115 116 117

    vlc_mutex_init( p_intf, &p_intf->p_sys->change_lock );
    p_intf->p_sys->i_size = 0;
    p_intf->pf_run = Run;

118
    var_AddCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
119
    return VLC_SUCCESS;
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
120 121 122 123 124 125 126 127 128
}

/*****************************************************************************
 * Close: destroy interface
 *****************************************************************************/
static void Close( vlc_object_t *p_this )
{
    intf_thread_t *p_intf = (intf_thread_t *)p_this;

129
    var_DelCallback( p_intf->p_libvlc, "key-pressed", KeyEvent, p_intf );
130

131
    vlc_mutex_destroy( &p_intf->p_sys->change_lock );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
132 133 134 135 136 137 138 139 140
    /* Destroy structure */
    free( p_intf->p_sys );
}

/*****************************************************************************
 * Run: main loop
 *****************************************************************************/
static void Run( intf_thread_t *p_intf )
{
141
    input_thread_t *p_input = NULL;
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
142
    vout_thread_t *p_vout = NULL;
143
    vout_thread_t *p_last_vout = NULL;
144
    struct hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
Gildas Bazin's avatar
 
Gildas Bazin committed
145 146
    vlc_value_t val;
    int i;
147
    playlist_t *p_playlist = pl_Yield( p_intf );
Gildas Bazin's avatar
 
Gildas Bazin committed
148 149 150 151

    /* Initialize hotkey structure */
    for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
    {
152
        var_Create( p_intf->p_libvlc, p_hotkeys[i].psz_action,
Gildas Bazin's avatar
 
Gildas Bazin committed
153 154
                    VLC_VAR_HOTKEY | VLC_VAR_DOINHERIT );

155
        var_AddCallback( p_intf->p_libvlc, p_hotkeys[i].psz_action,
Gildas Bazin's avatar
 
Gildas Bazin committed
156
                         ActionKeyCB, NULL );
157 158
        var_Get( p_intf->p_libvlc, p_hotkeys[i].psz_action, &val );
        var_Set( p_intf->p_libvlc, p_hotkeys[i].psz_action, val );
Gildas Bazin's avatar
 
Gildas Bazin committed
159 160
    }

161
    for( vlc_bool_t b_quit = VLC_FALSE ; !b_quit; )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
162
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
163
        int i_key, i_action;
164
        int i_times = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
165

Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
166
        /* Sleep a bit */
167
        /* msleep( INTF_IDLE_SLEEP ); */
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
168

Gildas Bazin's avatar
 
Gildas Bazin committed
169
        i_action = 0;
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
170
        i_key = GetKey( p_intf );
171

172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191
        /* Special action for mouse event */
        /* FIXME: This should probably be configurable */
        /* FIXME: rework hotkeys handling to allow more than 1 event
         * to trigger one same action */
        switch (i_key & KEY_SPECIAL)
        {
            case KEY_MOUSEWHEELUP:
                i_action = ACTIONID_VOL_UP;
                break;
            case KEY_MOUSEWHEELDOWN:
                i_action = ACTIONID_VOL_DOWN;
                break;
            case KEY_MOUSEWHEELLEFT:
                i_action = ACTIONID_JUMP_BACKWARD_EXTRASHORT;
                break;
            case KEY_MOUSEWHEELRIGHT:
                i_action = ACTIONID_JUMP_FORWARD_EXTRASHORT;
                break;
            default: break;
        }
192 193 194

        /* No mouse action, find action triggered by hotkey */
        if(!i_action)
195 196 197 198 199 200 201 202 203 204 205 206 207
        {
            for( i = 0; i_key != -1 && p_hotkeys[i].psz_action != NULL; i++ )
            {
                if( p_hotkeys[i].i_key == i_key )
                {
                    i_action = p_hotkeys[i].i_action;
                    i_times  = p_hotkeys[i].i_times;
                    /* times key pressed within max. delta time */
                    p_hotkeys[i].i_times = 0;
                    break;
                }
            }
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
208 209

        if( !i_action )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
210
        {
211
            b_quit = vlc_object_lock_and_wait( p_intf );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
212 213 214
            /* No key pressed, sleep a bit more */
            continue;
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
215

216 217 218 219 220 221
        /* Update the input */
        PL_LOCK;
        p_input = p_playlist->p_input;
        if( p_input )
            vlc_object_yield( p_input );
        PL_UNLOCK;
222

223 224 225 226 227 228 229 230 231 232 233 234 235 236
        /* Update the vout */
        p_last_vout = p_vout;
        p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );

        /* Register OSD channels */
        if( p_vout && p_vout != p_last_vout )
        {
            for( i = 0; i < CHANNELS_NUMBER; i++ )
            {
                spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER,
                             &p_intf->p_sys->p_channels[ i ] );
            }
        }

237
        /* Quit */
Gildas Bazin's avatar
 
Gildas Bazin committed
238
        if( i_action == ACTIONID_QUIT )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
239
        {
240 241
            if( p_playlist )
                playlist_Stop( p_playlist );
242
            vlc_object_kill( p_intf->p_libvlc );
243
            vlc_object_kill( p_intf );
244 245
            ClearChannels( p_intf, p_vout );
            vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) );
246 247 248 249
            if( p_vout )
                vlc_object_release( p_vout );
            if( p_input )
                vlc_object_release( p_input );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
250 251
            continue;
        }
252
        /* Volume and audio actions */
Gildas Bazin's avatar
 
Gildas Bazin committed
253
        else if( i_action == ACTIONID_VOL_UP )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
254 255 256
        {
            audio_volume_t i_newvol;
            aout_VolumeUp( p_intf, 1, &i_newvol );
257
            DisplayVolume( p_intf, p_vout, i_newvol );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
258
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
259
        else if( i_action == ACTIONID_VOL_DOWN )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
260 261 262
        {
            audio_volume_t i_newvol;
            aout_VolumeDown( p_intf, 1, &i_newvol );
263
            DisplayVolume( p_intf, p_vout, i_newvol );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
264
        }
Yoann Peronneau's avatar
Yoann Peronneau committed
265 266 267 268 269 270 271 272
        else if( i_action == ACTIONID_VOL_MUTE )
        {
            audio_volume_t i_newvol = -1;
            aout_VolumeMute( p_intf, &i_newvol );
            if( p_vout )
            {
                if( i_newvol == 0 )
                {
273 274 275
                    ClearChannels( p_intf, p_vout );
                    vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
                                  OSD_MUTE_ICON );
Yoann Peronneau's avatar
Yoann Peronneau committed
276 277 278
                }
                else
                {
279
                    DisplayVolume( p_intf, p_vout, i_newvol );
Yoann Peronneau's avatar
Yoann Peronneau committed
280 281 282
                }
            }
        }
283
        /* Interface showing */
284
        else if( i_action == ACTIONID_INTF_SHOW )
285
            var_SetBool( p_playlist, "intf-show", VLC_TRUE );
286
        else if( i_action == ACTIONID_INTF_HIDE )
287
            var_SetBool( p_playlist, "intf-show", VLC_FALSE );
288
        /* Video Output actions */
289 290 291 292
        else if( i_action == ACTIONID_SNAPSHOT )
        {
            if( p_vout ) vout_Control( p_vout, VOUT_SNAPSHOT );
        }
293
        else if( i_action == ACTIONID_TOGGLE_FULLSCREEN )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
294
        {
295 296
            if( p_vout )
            {
297 298
                var_Get( p_vout, "fullscreen", &val );
                val.b_bool = !val.b_bool;
299 300 301 302
                var_Set( p_vout, "fullscreen", val );
            }
            else
            {
303 304 305
                var_Get( p_playlist, "fullscreen", &val );
                val.b_bool = !val.b_bool;
                var_Set( p_playlist, "fullscreen", val );
306
            }
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
307
        }
308 309 310 311 312 313 314
        else if( i_action == ACTIONID_LEAVE_FULLSCREEN )
        {
            if( p_vout && var_GetBool( p_vout, "fullscreen" ) )
            {
                var_SetBool( p_vout, "fullscreen", VLC_FALSE );
            }
        }
315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332
        else if( i_action == ACTIONID_ZOOM_QUARTER ||
                 i_action == ACTIONID_ZOOM_HALF ||
                 i_action == ACTIONID_ZOOM_ORIGINAL ||
                 i_action == ACTIONID_ZOOM_DOUBLE )
        {
            if( p_vout )
            {
                if( i_action == ACTIONID_ZOOM_QUARTER )
                    val.f_float = 0.25;
                if( i_action == ACTIONID_ZOOM_HALF )
                    val.f_float = 0.5;
                if( i_action == ACTIONID_ZOOM_ORIGINAL )
                    val.f_float = 1;
                if( i_action == ACTIONID_ZOOM_DOUBLE )
                    val.f_float = 2;
                var_Set( p_vout, "zoom", val );
            }
        }
333 334 335 336 337 338 339 340 341 342 343 344 345 346 347
        else if( i_action == ACTIONID_WALLPAPER )
        {
            if( p_vout )
            {
                var_Get( p_vout, "directx-wallpaper", &val );
                val.b_bool = !val.b_bool;
                var_Set( p_vout, "directx-wallpaper", val );
            }
            else
            {
                var_Get( p_playlist, "directx-wallpaper", &val );
                val.b_bool = !val.b_bool;
                var_Set( p_playlist, "directx-wallpaper", val );
            }
        }
348
        /* Playlist actions */
Antoine Cellerier's avatar
Antoine Cellerier committed
349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377
        else if( i_action == ACTIONID_LOOP )
        {
            /* Toggle Normal -> Loop -> Repeat -> Normal ... */
            vlc_value_t val2;
            var_Get( p_playlist, "loop", &val );
            var_Get( p_playlist, "repeat", &val2 );
            if( val2.b_bool == VLC_TRUE )
            {
                val.b_bool = VLC_FALSE;
                val2.b_bool = VLC_FALSE;
            }
            else if( val.b_bool == VLC_TRUE )
            {
                val.b_bool = VLC_FALSE;
                val2.b_bool = VLC_TRUE;
            }
            else
            {
                val.b_bool = VLC_TRUE;
            }
            var_Set( p_playlist, "loop", val );
            var_Set( p_playlist, "repeat", val2 );
        }
        else if( i_action == ACTIONID_RANDOM )
        {
            var_Get( p_playlist, "random", &val );
            val.b_bool = !val.b_bool;
            var_Set( p_playlist, "random", val );
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
378
        else if( i_action == ACTIONID_PLAY_PAUSE )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
379
        {
380 381
            val.i_int = PLAYING_S;
            if( p_input )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
382
            {
383
                ClearChannels( p_intf, p_vout );
384 385 386 387 388 389 390 391 392 393 394 395 396 397

                var_Get( p_input, "state", &val );
                if( val.i_int != PAUSE_S )
                {
                    vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
                                  OSD_PAUSE_ICON );
                    val.i_int = PAUSE_S;
                }
                else
                {
                    vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
                                  OSD_PLAY_ICON );
                    val.i_int = PLAYING_S;
                }
398
                var_Set( p_input, "state", val );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
399 400 401
            }
            else
            {
402
                playlist_Play( p_playlist );
Gildas Bazin's avatar
 
Gildas Bazin committed
403
            }
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
404
        }
405
        /* Input options */
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
406 407
        else if( p_input )
        {
Laurent Aimar's avatar
Laurent Aimar committed
408 409 410 411 412
            /* FIXME --fenrir
             * How to get a valid value ?
             * That's not that easy with some special stream
             */
            vlc_bool_t b_seekable = VLC_TRUE;
413
            int i_interval =0;
414

Gildas Bazin's avatar
 
Gildas Bazin committed
415
            if( i_action == ACTIONID_PAUSE )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
416
            {
417 418 419 420 421 422 423 424 425
                var_Get( p_input, "state", &val );
                if( val.i_int != PAUSE_S )
                {
                    ClearChannels( p_intf, p_vout );
                    vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
                                  OSD_PAUSE_ICON );
                    val.i_int = PAUSE_S;
                    var_Set( p_input, "state", val );
                }
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
426
            }
427 428
            else if( i_action == ACTIONID_JUMP_BACKWARD_EXTRASHORT
                     && b_seekable )
429
            {
430
#define SET_TIME( a, b ) \
Clément Stenac's avatar
Clément Stenac committed
431
    i_interval = config_GetInt( p_input, a "-jump-size" ); \
432 433 434 435 436 437 438
    if( i_interval > 0 ) { \
        val.i_time = ( (mtime_t)(i_interval * b) * 1000000L \
                       * ((mtime_t)(1 << i_times))); \
        var_Set( p_input, "time-offset", val ); \
        DisplayPosition( p_intf, p_vout, p_input ); \
    }
                SET_TIME( "extrashort", -1 );
439
            }
440
            else if( i_action == ACTIONID_JUMP_FORWARD_EXTRASHORT && b_seekable )
441
            {
442
                SET_TIME( "extrashort", 1 );
443
            }
444
            else if( i_action == ACTIONID_JUMP_BACKWARD_SHORT && b_seekable )
Gildas Bazin's avatar
 
Gildas Bazin committed
445
            {
446
                SET_TIME( "short", -1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
447
            }
448
            else if( i_action == ACTIONID_JUMP_FORWARD_SHORT && b_seekable )
Gildas Bazin's avatar
 
Gildas Bazin committed
449
            {
450
                SET_TIME( "short", 1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
451
            }
452
            else if( i_action == ACTIONID_JUMP_BACKWARD_MEDIUM && b_seekable )
Gildas Bazin's avatar
 
Gildas Bazin committed
453
            {
454
                SET_TIME( "medium", -1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
455
            }
456
            else if( i_action == ACTIONID_JUMP_FORWARD_MEDIUM && b_seekable )
Gildas Bazin's avatar
 
Gildas Bazin committed
457
            {
458
                SET_TIME( "medium", 1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
459
            }
460
            else if( i_action == ACTIONID_JUMP_BACKWARD_LONG && b_seekable )
Gildas Bazin's avatar
 
Gildas Bazin committed
461
            {
462
                SET_TIME( "long", -1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
463
            }
464
            else if( i_action == ACTIONID_JUMP_FORWARD_LONG && b_seekable )
Gildas Bazin's avatar
 
Gildas Bazin committed
465
            {
466 467
                SET_TIME( "long", 1 );
#undef SET_TIME
Gildas Bazin's avatar
 
Gildas Bazin committed
468
            }
469 470 471 472 473 474 475 476
            else if( i_action == ACTIONID_AUDIO_TRACK )
            {
                vlc_value_t val, list, list2;
                int i_count, i;
                var_Get( p_input, "audio-es", &val );
                var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES,
                            &list, &list2 );
                i_count = list.p_list->i_count;
477 478 479 480
                if( i_count <= 1 )
                {
                    continue;
                }
481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499
                for( i = 0; i < i_count; i++ )
                {
                    if( val.i_int == list.p_list->p_values[i].i_int )
                    {
                        break;
                    }
                }
                /* value of audio-es was not in choices list */
                if( i == i_count )
                {
                    msg_Warn( p_input,
                              "invalid current audio track, selecting 0" );
                    var_Set( p_input, "audio-es",
                             list.p_list->p_values[0] );
                    i = 0;
                }
                else if( i == i_count - 1 )
                {
                    var_Set( p_input, "audio-es",
500 501
                             list.p_list->p_values[1] );
                    i = 1;
502 503 504 505 506 507 508 509 510 511 512
                }
                else
                {
                    var_Set( p_input, "audio-es",
                             list.p_list->p_values[i+1] );
                    i++;
                }
                vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                 _("Audio track: %s"),
                                 list2.p_list->p_values[i].psz_string );
            }
513 514 515 516 517 518 519 520 521 522 523 524
            else if( i_action == ACTIONID_AUDIODEVICE_CYCLE && p_vout)
            {
                vlc_value_t val, list, list2;
                int i_count, i;
                aout_instance_t *p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE );
                var_Get( p_aout, "audio-device", &val );
                var_Change( p_aout, "audio-device", VLC_VAR_GETCHOICES,&list, &list2 );
                i_count = list.p_list->i_count;
                if( i_count <= 1 )
                {
                    continue;
                }
525

526
                for( i = 0; i < i_count; i++ )
527 528 529 530 531 532 533 534 535 536 537
                {
                    if( val.i_int == list.p_list->p_values[i].i_int )
                    {
                        break;
                    }
                }
                if( i == i_count )
                {
                    msg_Warn( p_aout,
                              "invalid current audio device, selecting 0" );
                    var_Set( p_aout, "audio-device",
538 539
                             list.p_list->p_values[0] );
                    i = 0;
540

541 542 543
                }
                else if( i == i_count -1 )
                {
544
                  var_Set( p_aout, "audio-device",
545 546
                             list.p_list->p_values[0] );
                    i = 0;
547

548 549 550
                }
                else
                {
551
                  var_Set( p_aout, "audio-device",
552
                             list.p_list->p_values[i+1] );
553
                    i++;
554
                }
555
                vout_OSDMessage( VLC_OBJECT(p_input),
556 557
                                 DEFAULT_CHAN,
                                 _("Audio Device: %s"),
558
                                 list2.p_list->p_values[i].psz_string);
559
                vlc_object_release( p_aout );
560
            }
561
            else if( i_action == ACTIONID_SUBTITLE_TRACK )
562 563 564 565
            {
                vlc_value_t val, list, list2;
                int i_count, i;
                var_Get( p_input, "spu-es", &val );
566

567 568 569
                var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES,
                            &list, &list2 );
                i_count = list.p_list->i_count;
570 571
                if( i_count <= 1 )
                {
572 573
                    vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                     _("Subtitle track: %s"), _("N/A") );
574 575
                    continue;
                }
576 577 578 579 580 581 582
                for( i = 0; i < i_count; i++ )
                {
                    if( val.i_int == list.p_list->p_values[i].i_int )
                    {
                        break;
                    }
                }
583
                /* value of spu-es was not in choices list */
584 585
                if( i == i_count )
                {
586 587
                    msg_Warn( p_input,
                              "invalid current subtitle track, selecting 0" );
588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604
                    var_Set( p_input, "spu-es", list.p_list->p_values[0] );
                    i = 0;
                }
                else if( i == i_count - 1 )
                {
                    var_Set( p_input, "spu-es", list.p_list->p_values[0] );
                    i = 0;
                }
                else
                {
                    var_Set( p_input, "spu-es", list.p_list->p_values[i+1] );
                    i = i + 1;
                }
                vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                 _("Subtitle track: %s"),
                                 list2.p_list->p_values[i].psz_string );
            }
605
            else if( i_action == ACTIONID_ASPECT_RATIO && p_vout )
606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630
            {
                vlc_value_t val={0}, val_list, text_list;
                var_Get( p_vout, "aspect-ratio", &val );
                if( var_Change( p_vout, "aspect-ratio", VLC_VAR_GETLIST,
                                &val_list, &text_list ) >= 0 )
                {
                    int i;
                    for( i = 0; i < val_list.p_list->i_count; i++ )
                    {
                        if( !strcmp( val_list.p_list->p_values[i].psz_string,
                                     val.psz_string ) )
                        {
                            i++;
                            break;
                        }
                    }
                    if( i == val_list.p_list->i_count ) i = 0;
                    var_SetString( p_vout, "aspect-ratio",
                                   val_list.p_list->p_values[i].psz_string );
                    vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                     _("Aspect ratio: %s"),
                                     text_list.p_list->p_values[i].psz_string );
                }
                free( val.psz_string );
            }
631
            else if( i_action == ACTIONID_CROP && p_vout )
632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656
            {
                vlc_value_t val={0}, val_list, text_list;
                var_Get( p_vout, "crop", &val );
                if( var_Change( p_vout, "crop", VLC_VAR_GETLIST,
                                &val_list, &text_list ) >= 0 )
                {
                    int i;
                    for( i = 0; i < val_list.p_list->i_count; i++ )
                    {
                        if( !strcmp( val_list.p_list->p_values[i].psz_string,
                                     val.psz_string ) )
                        {
                            i++;
                            break;
                        }
                    }
                    if( i == val_list.p_list->i_count ) i = 0;
                    var_SetString( p_vout, "crop",
                                   val_list.p_list->p_values[i].psz_string );
                    vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                     _("Crop: %s"),
                                     text_list.p_list->p_values[i].psz_string );
                }
                free( val.psz_string );
            }
657
            else if( i_action == ACTIONID_DEINTERLACE && p_vout )
658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682
            {
                vlc_value_t val={0}, val_list, text_list;
                var_Get( p_vout, "deinterlace", &val );
                if( var_Change( p_vout, "deinterlace", VLC_VAR_GETLIST,
                                &val_list, &text_list ) >= 0 )
                {
                    int i;
                    for( i = 0; i < val_list.p_list->i_count; i++ )
                    {
                        if( !strcmp( val_list.p_list->p_values[i].psz_string,
                                     val.psz_string ) )
                        {
                            i++;
                            break;
                        }
                    }
                    if( i == val_list.p_list->i_count ) i = 0;
                    var_SetString( p_vout, "deinterlace",
                                   val_list.p_list->p_values[i].psz_string );
                    vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                     _("Deinterlace mode: %s"),
                                     text_list.p_list->p_values[i].psz_string );
                }
                free( val.psz_string );
            }
683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711
            else if( ( i_action == ACTIONID_ZOOM || i_action == ACTIONID_UNZOOM ) && p_vout )
            {
                vlc_value_t val={0}, val_list, text_list;
                var_Get( p_vout, "zoom", &val );
                if( var_Change( p_vout, "zoom", VLC_VAR_GETLIST,
                                &val_list, &text_list ) >= 0 )
                {
                    int i;
                    for( i = 0; i < val_list.p_list->i_count; i++ )
                    {
                        if( val_list.p_list->p_values[i].f_float
                           == val.f_float )
                        {
                            if( i_action == ACTIONID_ZOOM )
                                i++;
                            else /* ACTIONID_UNZOOM */
                                i--;
                            break;
                        }
                    }
                    if( i == val_list.p_list->i_count ) i = 0;
                    if( i == -1 ) i = val_list.p_list->i_count-1;
                    var_SetFloat( p_vout, "zoom",
                                  val_list.p_list->p_values[i].f_float );
                    vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                     _("Zoom mode: %s"),
                                text_list.p_list->p_values[i].var.psz_name );
                }
            }
712
            else if( i_action == ACTIONID_CROP_TOP && p_vout )
713
                var_IncInteger( p_vout, "crop-top" );
714
            else if( i_action == ACTIONID_UNCROP_TOP && p_vout )
715
                var_DecInteger( p_vout, "crop-top" );
716
            else if( i_action == ACTIONID_CROP_BOTTOM && p_vout )
717
                var_IncInteger( p_vout, "crop-bottom" );
718
            else if( i_action == ACTIONID_UNCROP_BOTTOM && p_vout )
719
                 var_DecInteger( p_vout, "crop-bottom" );
720
            else if( i_action == ACTIONID_CROP_LEFT && p_vout )
721
                 var_IncInteger( p_vout, "crop-left" );
722
            else if( i_action == ACTIONID_UNCROP_LEFT && p_vout )
723
                 var_DecInteger( p_vout, "crop-left" );
724
            else if( i_action == ACTIONID_CROP_RIGHT && p_vout )
725
                 var_IncInteger( p_vout, "crop-right" );
726
            else if( i_action == ACTIONID_UNCROP_RIGHT && p_vout )
727 728
                 var_DecInteger( p_vout, "crop-right" );

Gildas Bazin's avatar
 
Gildas Bazin committed
729
            else if( i_action == ACTIONID_NEXT )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
730
            {
731 732
                vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, _("Next") );
                playlist_Next( p_playlist );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
733
            }
Gildas Bazin's avatar
 
Gildas Bazin committed
734
            else if( i_action == ACTIONID_PREV )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
735
            {
736 737 738
                vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                 _("Previous") );
                playlist_Prev( p_playlist );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
739
            }
Gildas Bazin's avatar
 
Gildas Bazin committed
740
            else if( i_action == ACTIONID_STOP )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
741
            {
742
                playlist_Stop( p_playlist );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
743
            }
Gildas Bazin's avatar
 
Gildas Bazin committed
744
            else if( i_action == ACTIONID_FASTER )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
745
            {
746
                var_SetVoid( p_input, "rate-faster" );
747 748
                vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                 _("Faster") );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
749
            }
750
            else if( i_action == ACTIONID_SLOWER )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
751
            {
752
                var_SetVoid( p_input, "rate-slower" );
753 754
                vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                 _("Slower") );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
755
            }
756
            else if( i_action == ACTIONID_POSITION && b_seekable )
757
            {
758
                DisplayPosition( p_intf, p_vout, p_input );
759 760 761 762 763 764 765 766 767 768
            }
            else if( i_action >= ACTIONID_PLAY_BOOKMARK1 &&
                     i_action <= ACTIONID_PLAY_BOOKMARK10 )
            {
                PlayBookmark( p_intf, i_action - ACTIONID_PLAY_BOOKMARK1 + 1 );
            }
            else if( i_action >= ACTIONID_SET_BOOKMARK1 &&
                     i_action <= ACTIONID_SET_BOOKMARK10 )
            {
                SetBookmark( p_intf, i_action - ACTIONID_SET_BOOKMARK1 + 1 );
769
            }
770 771
            /* Only makes sense with DVD */
            else if( i_action == ACTIONID_TITLE_PREV )
772
                var_SetVoid( p_input, "prev-title" );
773
            else if( i_action == ACTIONID_TITLE_NEXT )
774
                var_SetVoid( p_input, "next-title" );
775
            else if( i_action == ACTIONID_CHAPTER_PREV )
776
                var_SetVoid( p_input, "prev-chapter" );
777
            else if( i_action == ACTIONID_CHAPTER_NEXT )
778
                var_SetVoid( p_input, "next-chapter" );
779
            else if( i_action == ACTIONID_DISC_MENU )
780 781
                var_SetInteger( p_input, "title  0", 2 );

782 783 784 785 786 787
            else if( i_action == ACTIONID_SUBDELAY_DOWN )
            {
                int64_t i_delay = var_GetTime( p_input, "spu-delay" );
                i_delay -= 50000;    /* 50 ms */
                var_SetTime( p_input, "spu-delay", i_delay );
                ClearChannels( p_intf, p_vout );
Clément Stenac's avatar
Clément Stenac committed
788 789
                vout_OSDMessage( p_intf, DEFAULT_CHAN,
                                 _( "Subtitle delay %i ms" ),
790 791 792 793 794 795 796 797
                                 (int)(i_delay/1000) );
            }
            else if( i_action == ACTIONID_SUBDELAY_UP )
            {
                int64_t i_delay = var_GetTime( p_input, "spu-delay" );
                i_delay += 50000;    /* 50 ms */
                var_SetTime( p_input, "spu-delay", i_delay );
                ClearChannels( p_intf, p_vout );
Clément Stenac's avatar
Clément Stenac committed
798 799
                vout_OSDMessage( p_intf, DEFAULT_CHAN,
                                _( "Subtitle delay %i ms" ),
800 801 802 803 804 805 806 807
                                 (int)(i_delay/1000) );
            }
            else if( i_action == ACTIONID_AUDIODELAY_DOWN )
            {
                int64_t i_delay = var_GetTime( p_input, "audio-delay" );
                i_delay -= 50000;    /* 50 ms */
                var_SetTime( p_input, "audio-delay", i_delay );
                ClearChannels( p_intf, p_vout );
Clément Stenac's avatar
Clément Stenac committed
808 809
                vout_OSDMessage( p_intf, DEFAULT_CHAN,
                                _( "Audio delay %i ms" ),
810 811 812 813 814 815 816 817
                                 (int)(i_delay/1000) );
            }
            else if( i_action == ACTIONID_AUDIODELAY_UP )
            {
                int64_t i_delay = var_GetTime( p_input, "audio-delay" );
                i_delay += 50000;    /* 50 ms */
                var_SetTime( p_input, "audio-delay", i_delay );
                ClearChannels( p_intf, p_vout );
Clément Stenac's avatar
Clément Stenac committed
818 819
                vout_OSDMessage( p_intf, DEFAULT_CHAN,
                                _( "Audio delay %i ms" ),
820 821 822 823
                                 (int)(i_delay/1000) );
            }
            else if( i_action == ACTIONID_PLAY )
            {
824 825
                var_Get( p_input, "rate", &val );
                if( val.i_int != INPUT_RATE_DEFAULT )
826
                {
827 828 829 830 831 832 833 834 835
                    /* Return to normal speed */
                    var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT );
                }
                else
                {
                    ClearChannels( p_intf, p_vout );
                    vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
                                  OSD_PLAY_ICON );
                    playlist_Play( p_playlist );
836 837
                }
            }
838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865
            else if( i_action == ACTIONID_MENU_ON )
            {
                osd_MenuShow( VLC_OBJECT(p_intf) );
            }
            else if( i_action == ACTIONID_MENU_OFF )
            {
                osd_MenuHide( VLC_OBJECT(p_intf) );
            }
            else if( i_action == ACTIONID_MENU_LEFT )
            {
                osd_MenuPrev( VLC_OBJECT(p_intf) );
            }
            else if( i_action == ACTIONID_MENU_RIGHT )
            {
                osd_MenuNext( VLC_OBJECT(p_intf) );
            }
            else if( i_action == ACTIONID_MENU_UP )
            {
                osd_MenuUp( VLC_OBJECT(p_intf) );
            }
            else if( i_action == ACTIONID_MENU_DOWN )
            {
                osd_MenuDown( VLC_OBJECT(p_intf) );
            }
            else if( i_action == ACTIONID_MENU_SELECT )
            {
                osd_MenuActivate( VLC_OBJECT(p_intf) );
            }
866

Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
867
        }
868 869 870 871
        if( p_vout )
            vlc_object_release( p_vout );
        if( p_input )
            vlc_object_release( p_input );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
872
    }
873
    pl_Release( p_intf );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
874 875
}

Gildas Bazin's avatar
 
Gildas Bazin committed
876
static int GetKey( intf_thread_t *p_intf)
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
877 878 879 880 881
{
    vlc_mutex_lock( &p_intf->p_sys->change_lock );
    if ( p_intf->p_sys->i_size == 0 )
    {
        vlc_mutex_unlock( &p_intf->p_sys->change_lock );
Gildas Bazin's avatar
 
Gildas Bazin committed
882
        return -1;
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901
    }
    else
    {
        int i_return = p_intf->p_sys->p_keys[ 0 ];
        int i;
        p_intf->p_sys->i_size--;
        for ( i = 0; i < BUFFER_SIZE - 1; i++)
        {
            p_intf->p_sys->p_keys[ i ] = p_intf->p_sys->p_keys[ i + 1 ];
        }
        vlc_mutex_unlock( &p_intf->p_sys->change_lock );
        return i_return;
    }
}

/*****************************************************************************
 * KeyEvent: callback for keyboard events
 *****************************************************************************/
static int KeyEvent( vlc_object_t *p_this, char const *psz_var,
Gildas Bazin's avatar
 
Gildas Bazin committed
902
                     vlc_value_t oldval, vlc_value_t newval, void *p_data )
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
903
{
Rafaël Carré's avatar
Rafaël Carré committed
904
    VLC_UNUSED(psz_var); VLC_UNUSED(oldval);
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
905
    intf_thread_t *p_intf = (intf_thread_t *)p_data;
906 907 908 909 910
    if ( !newval.i_int )
    {
        msg_Warn( p_this, "Received invalid key event %d", newval.i_int );
        return VLC_EGENERIC;
    }
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
911 912 913
    vlc_mutex_lock( &p_intf->p_sys->change_lock );
    if ( p_intf->p_sys->i_size == BUFFER_SIZE )
    {
Anil Daoud's avatar
Anil Daoud committed
914
        msg_Warn( p_intf, "event buffer full, dropping keypress" );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
915 916 917 918 919 920 921
        vlc_mutex_unlock( &p_intf->p_sys->change_lock );
        return VLC_EGENERIC;
    }
    else
    {
        p_intf->p_sys->p_keys[ p_intf->p_sys->i_size ] = newval.i_int;
        p_intf->p_sys->i_size++;
Gildas Bazin's avatar
 
Gildas Bazin committed
922
    }
923 924 925
    vlc_mutex_lock( &p_intf->object_lock );
    vlc_cond_signal( &p_intf->object_wait );
    vlc_mutex_unlock( &p_intf->object_lock );
Sigmund Augdal Helberg's avatar
Sigmund Augdal Helberg committed
926 927 928 929 930
    vlc_mutex_unlock( &p_intf->p_sys->change_lock );

    return VLC_SUCCESS;
}

Gildas Bazin's avatar
 
Gildas Bazin committed
931 932 933
static int ActionKeyCB( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
Rafaël Carré's avatar
Rafaël Carré committed
934
    VLC_UNUSED(oldval); VLC_UNUSED(p_data);
935 936
    libvlc_int_t *p_libvlc = (libvlc_int_t *)p_this;
    struct hotkey *p_hotkeys = p_libvlc->p_hotkeys;
937
    mtime_t i_date;
Gildas Bazin's avatar
 
Gildas Bazin committed
938 939 940 941 942 943 944
    int i;

    for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
    {
        if( !strcmp( p_hotkeys[i].psz_action, psz_var ) )
        {
            p_hotkeys[i].i_key = newval.i_int;
945
            /* do hotkey accounting */
946 947 948 949 950 951 952
            i_date = mdate();
            if( (p_hotkeys[i].i_delta_date > 0) &&
                (p_hotkeys[i].i_delta_date <= (i_date - p_hotkeys[i].i_last_date) ) )
                p_hotkeys[i].i_times = 0;
            else
                p_hotkeys[i].i_times++;
            p_hotkeys[i].i_last_date = i_date;
Gildas Bazin's avatar
 
Gildas Bazin committed
953 954 955 956 957
        }
    }

    return VLC_SUCCESS;
}
958 959

static void PlayBookmark( intf_thread_t *p_intf, int i_num )
960
{
961 962
    vlc_value_t val;
    char psz_bookmark_name[11];
963
    playlist_t *p_playlist = pl_Yield( p_intf );
964

965 966 967
    sprintf( psz_bookmark_name, "bookmark%i", i_num );
    var_Create( p_intf, psz_bookmark_name, VLC_VAR_STRING|VLC_VAR_DOINHERIT );
    var_Get( p_intf, psz_bookmark_name, &val );
968

969
    char *psz_bookmark = strdup( val.psz_string );
970 971
    PL_LOCK;
    FOREACH_ARRAY( playlist_item_t *p_item, p_playlist->items )
972 973
        char *psz_uri = input_item_GetURI( p_item->p_input );
        if( !strcmp( psz_bookmark, psz_uri ) )
974
        {
975
            free( psz_uri );
976 977
            playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE,
                              NULL, p_item );
978
            break;
979
        }
980 981
        else
            free( psz_uri );
982
    FOREACH_END();
983
    PL_UNLOCK;
984
    vlc_object_release( p_playlist );
985 986 987 988
}

static void SetBookmark( intf_thread_t *p_intf, int i_num )
{
989 990 991 992 993 994
    playlist_t *p_playlist = pl_Yield( p_intf );
    char psz_bookmark_name[11];
    sprintf( psz_bookmark_name, "bookmark%i", i_num );
    var_Create( p_intf, psz_bookmark_name,
                VLC_VAR_STRING|VLC_VAR_DOINHERIT );
    if( p_playlist->status.p_item )
995
    {
996 997 998 999
        char *psz_uri = input_item_GetURI( p_playlist->status.p_item->p_input );
        config_PutPsz( p_intf, psz_bookmark_name, psz_uri);
        msg_Info( p_intf, "setting playlist bookmark %i to %s", i_num, psz_uri);
        free( psz_uri );
1000
        config_SaveConfigFile( p_intf, "hotkeys" );
1001
    }
1002
    pl_Release( p_intf );
1003
}
1004

1005 1006
static void DisplayPosition( intf_thread_t *p_intf, vout_thread_t *p_vout,
                             input_thread_t *p_input )
1007 1008 1009
{
    char psz_duration[MSTRTIME_MAX_SIZE];
    char psz_time[MSTRTIME_MAX_SIZE];
1010
    vlc_value_t time, pos;
1011 1012
    mtime_t i_seconds;

1013 1014
    if( p_vout == NULL ) return;

1015
    ClearChannels( p_intf, p_vout );
1016

1017 1018 1019 1020 1021 1022 1023 1024
    var_Get( p_input, "time", &time );
    i_seconds = time.i_time / 1000000;
    secstotimestr ( psz_time, i_seconds );

    var_Get( p_input, "length", &time );
    if( time.i_time > 0 )
    {
        secstotimestr( psz_duration, time.i_time / 1000000 );
Clément Stenac's avatar
Clément Stenac committed
1025
        vout_OSDMessage( p_input, POSITION_TEXT_CHAN, (char *) "%s / %s",
1026 1027 1028 1029
                         psz_time, psz_duration );
    }
    else if( i_seconds > 0 )
    {
1030
        vout_OSDMessage( p_input, POSITION_TEXT_CHAN, psz_time );
1031
    }
1032 1033 1034 1035

    if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
    {
        var_Get( p_input, "position", &pos );
1036
        vout_OSDSlider( VLC_OBJECT( p_input ), POSITION_WIDGET_CHAN,
1037 1038 1039 1040
                        pos.f_float * 100, OSD_HOR_SLIDER );
    }
}

1041 1042
static void DisplayVolume( intf_thread_t *p_intf, vout_thread_t *p_vout,
                           audio_volume_t i_vol )
1043 1044 1045 1046 1047
{
    if( p_vout == NULL )
    {
        return;
    }
1048
    ClearChannels( p_intf, p_vout );
1049 1050 1051

    if( !p_vout->p_parent_intf || p_vout->b_fullscreen )
    {
1052
        vout_OSDSlider( VLC_OBJECT( p_vout ), VOLUME_WIDGET_CHAN,
1053 1054 1055 1056
            i_vol*100/AOUT_VOLUME_MAX, OSD_VERT_SLIDER );
    }
    else
    {
Clément Stenac's avatar
Clément Stenac committed
1057
        vout_OSDMessage( p_vout, VOLUME_TEXT_CHAN, _( "Volume %d%%" ),
1058
                         i_vol*400/AOUT_VOLUME_MAX );
1059
    }
1060
}
1061 1062 1063 1064 1065

static void ClearChannels( intf_thread_t *p_intf, vout_thread_t *p_vout )
{
    int i;

1066
    if( p_vout )