intf.m 47.8 KB
Newer Older
1
/*****************************************************************************
2
 * intf.m: MacOS X interface module
3
 *****************************************************************************
4
 * Copyright (C) 2002-2004 VideoLAN
5
 * $Id$
6 7 8
 *
 * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
 *          Christophe Massiot <massiot@via.ecp.fr>
9
 *          Derk-Jan Hartman <hartman at videolan.org>
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
 *
 * 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.
 * 
 * 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
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/
#include <stdlib.h>                                      /* malloc(), free() */
#include <sys/param.h>                                    /* for MAXPATHLEN */
#include <string.h>
32
#include <vlc_keys.h>
33 34 35

#include "intf.h"
#include "vout.h"
36
#include "prefs.h"
37
#include "playlist.h"
38
#include "info.h"
39
#include "controls.h"
40 41 42 43

/*****************************************************************************
 * Local prototypes.
 *****************************************************************************/
44
static void Run ( intf_thread_t *p_intf );
45 46 47 48 49 50 51 52 53 54 55 56 57 58 59

/*****************************************************************************
 * OpenIntf: initialize interface
 *****************************************************************************/
int E_(OpenIntf) ( vlc_object_t *p_this )
{   
    intf_thread_t *p_intf = (intf_thread_t*) p_this;

    p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
    if( p_intf->p_sys == NULL )
    {
        return( 1 );
    }

    memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
60
    
61
    p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
62 63 64 65 66 67 68
    
    /* Put Cocoa into multithread mode as soon as possible.
     * http://developer.apple.com/techpubs/macosx/Cocoa/
     * TasksAndConcepts/ProgrammingTopics/Multithreading/index.html
     * This thread does absolutely nothing at all. */
    [NSThread detachNewThreadSelector:@selector(self) toTarget:[NSString string] withObject:nil];
    
69 70
    p_intf->p_sys->o_sendport = [[NSPort port] retain];
    p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
hartman's avatar
hartman committed
71
    p_intf->b_play = VLC_TRUE;
72
    p_intf->pf_run = Run;
73
    
74 75 76
    [[VLCApplication sharedApplication] autorelease];
    [NSApp setIntf: p_intf];

77

78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102
    [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];

    return( 0 );
}

/*****************************************************************************
 * CloseIntf: destroy interface
 *****************************************************************************/
void E_(CloseIntf) ( vlc_object_t *p_this )
{
    intf_thread_t *p_intf = (intf_thread_t*) p_this;

    msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );

    [p_intf->p_sys->o_sendport release];
    [p_intf->p_sys->o_pool release];

    free( p_intf->p_sys );
}

/*****************************************************************************
 * Run: main loop
 *****************************************************************************/
static void Run( intf_thread_t *p_intf )
{
103 104 105 106 107
    /* Do it again - for some unknown reason, vlc_thread_create() often
     * fails to go to real-time priority with the first launched thread
     * (???) --Meuuh */
    vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );

108 109 110 111 112 113 114 115 116 117
    [NSApp run];
}

/*****************************************************************************
 * VLCApplication implementation 
 *****************************************************************************/
@implementation VLCApplication

- (NSString *)localizedString:(char *)psz
{
118 119 120 121
    NSString * o_str = nil;

    if( psz != NULL )
    {
122 123 124 125 126
        o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease];
    }
    if ( o_str == NULL )
    {
        msg_Err( p_intf, "could not translate: %s", psz );
127 128 129
    }

    return( o_str );
130 131
}

132 133
- (char *)delocalizeString:(NSString *)id
{
134
    NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding
135 136 137 138 139
                          allowLossyConversion: NO];
    char * psz_string;

    if ( o_data == nil )
    {
140
        o_data = [id dataUsingEncoding: NSUTF8StringEncoding
141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157
                     allowLossyConversion: YES];
        psz_string = malloc( [o_data length] + 1 ); 
        [o_data getBytes: psz_string];
        psz_string[ [o_data length] ] = '\0';
        msg_Err( p_intf, "cannot convert to wanted encoding: %s",
                 psz_string );
    }
    else
    {
        psz_string = malloc( [o_data length] + 1 ); 
        [o_data getBytes: psz_string];
        psz_string[ [o_data length] ] = '\0';
    }

    return psz_string;
}

158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200
/* i_width is in pixels */
- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int) i_width
{
    NSMutableString *o_wrapped;
    NSString *o_out_string;
    NSRange glyphRange, effectiveRange, charRange;
    NSRect lineFragmentRect;
    unsigned glyphIndex, breaksInserted = 0;

    NSTextStorage *o_storage = [[NSTextStorage alloc] initWithString: o_in_string
        attributes: [NSDictionary dictionaryWithObjectsAndKeys:
        [NSFont labelFontOfSize: 0.0], NSFontAttributeName, nil]];
    NSLayoutManager *o_layout_manager = [[NSLayoutManager alloc] init];
    NSTextContainer *o_container = [[NSTextContainer alloc]
        initWithContainerSize: NSMakeSize(i_width, 2000)];
    
    [o_layout_manager addTextContainer: o_container];
    [o_container release];
    [o_storage addLayoutManager: o_layout_manager];
    [o_layout_manager release];
        
    o_wrapped = [o_in_string mutableCopy];
    glyphRange = [o_layout_manager glyphRangeForTextContainer: o_container];
    
    for( glyphIndex = glyphRange.location ; glyphIndex < NSMaxRange(glyphRange) ;
            glyphIndex += effectiveRange.length) {
        lineFragmentRect = [o_layout_manager lineFragmentRectForGlyphAtIndex: glyphIndex
                                            effectiveRange: &effectiveRange];
        charRange = [o_layout_manager characterRangeForGlyphRange: effectiveRange
                                    actualGlyphRange: &effectiveRange];
        if ([o_wrapped lineRangeForRange:
                NSMakeRange(charRange.location + breaksInserted, charRange.length)].length > charRange.length) {
            [o_wrapped insertString: @"\n" atIndex: NSMaxRange(charRange) + breaksInserted];
            breaksInserted++;
        }
    }
    o_out_string = [NSString stringWithString: o_wrapped];
    [o_wrapped release];
    [o_storage release];
    
    return o_out_string;
}

201 202 203 204 205 206 207 208 209 210 211 212
- (void)setIntf:(intf_thread_t *)_p_intf
{
    p_intf = _p_intf;
}

- (intf_thread_t *)getIntf
{
    return( p_intf );
}

- (void)terminate:(id)sender
{
213
    p_intf->p_vlc->b_die = VLC_TRUE;
214 215
}

216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259

/*****************************************************************************
 * hasDefinedShortcutKey: Check to see if the key press is a defined VLC
 * shortcut key.  If it is, pass it off to VLC for handling and return YES,
 * otherwise ignore it and return NO (where it will get handled by Cocoa).
 *****************************************************************************/
- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event
{
    unichar key = 0;
    vlc_value_t val;
    unsigned int i_pressed_modifiers = 0;
    struct hotkey *p_hotkeys;
    int i;

    val.i_int = 0;
    p_hotkeys = p_intf->p_vlc->p_hotkeys;

    i_pressed_modifiers = [o_event modifierFlags];

    if( i_pressed_modifiers & NSShiftKeyMask )
        val.i_int |= KEY_MODIFIER_SHIFT;
    if( i_pressed_modifiers & NSControlKeyMask )
        val.i_int |= KEY_MODIFIER_CTRL;
    if( i_pressed_modifiers & NSAlternateKeyMask )
        val.i_int |= KEY_MODIFIER_ALT;
    if( i_pressed_modifiers & NSCommandKeyMask )
        val.i_int |= KEY_MODIFIER_COMMAND;

    key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];

    val.i_int |= CocoaKeyToVLC( key );

    for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
    {
        if( p_hotkeys[i].i_key == val.i_int )
        {
            var_Set( p_intf->p_vlc, "key-pressed", val );
            return YES;
        }
    }

    return NO;
}

260 261
@end

262
int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
263
{
264
    int i_ret = 0;
265

266 267 268 269
    NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];

    if( [target respondsToSelector: @selector(performSelectorOnMainThread:
                                             withObject:waitUntilDone:)] )
270
    {
271 272 273
        [target performSelectorOnMainThread: sel
                withObject: [NSValue valueWithPointer: p_arg]
                waitUntilDone: YES];
274
    }
275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321
    else if( NSApp != nil && [NSApp respondsToSelector: @selector(getIntf)] ) 
    {
        NSValue * o_v1;
        NSValue * o_v2;
        NSArray * o_array;
        NSPort * o_recv_port;
        NSInvocation * o_inv;
        NSPortMessage * o_msg;
        intf_thread_t * p_intf;
        NSConditionLock * o_lock;
        NSMethodSignature * o_sig;

        id * val[] = { &o_lock, &o_v2 };

        p_intf = (intf_thread_t *)[NSApp getIntf];

        o_recv_port = [[NSPort port] retain];
        o_v1 = [NSValue valueWithPointer: val]; 
        o_v2 = [NSValue valueWithPointer: p_arg];

        o_sig = [target methodSignatureForSelector: sel];
        o_inv = [NSInvocation invocationWithMethodSignature: o_sig];
        [o_inv setArgument: &o_v1 atIndex: 2];
        [o_inv setTarget: target];
        [o_inv setSelector: sel];

        o_array = [NSArray arrayWithObject:
            [NSData dataWithBytes: &o_inv length: sizeof(o_inv)]];
        o_msg = [[NSPortMessage alloc]
            initWithSendPort: p_intf->p_sys->o_sendport
            receivePort: o_recv_port components: o_array];

        o_lock = [[NSConditionLock alloc] initWithCondition: 0];
        [o_msg sendBeforeDate: [NSDate distantPast]];
        [o_lock lockWhenCondition: 1];
        [o_lock unlock];
        [o_lock release];

        [o_msg release];
        [o_recv_port release];
    } 
    else
    {
        i_ret = 1;
    }

    [o_pool release];
322

323
    return( i_ret );
324 325
}

326 327 328 329 330 331 332 333
/*****************************************************************************
 * playlistChanged: Callback triggered by the intf-change playlist
 * variable, to let the intf update the playlist.
 *****************************************************************************/
int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
                     vlc_value_t old_val, vlc_value_t new_val, void *param )
{
    intf_thread_t * p_intf = [NSApp getIntf];
hartman's avatar
hartman committed
334 335
    p_intf->p_sys->b_playlist_update = TRUE;
    p_intf->p_sys->b_intf_update = TRUE;
336 337 338
    return VLC_SUCCESS;
}

339 340 341
static struct
{
    unichar i_nskey;
342
    unsigned int i_vlckey;
343 344 345 346 347 348 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
} nskeys_to_vlckeys[] = 
{
    { NSUpArrowFunctionKey, KEY_UP },
    { NSDownArrowFunctionKey, KEY_DOWN },
    { NSLeftArrowFunctionKey, KEY_LEFT },
    { NSRightArrowFunctionKey, KEY_RIGHT },
    { NSF1FunctionKey, KEY_F1 },
    { NSF2FunctionKey, KEY_F2 },
    { NSF3FunctionKey, KEY_F3 },
    { NSF4FunctionKey, KEY_F4 },
    { NSF5FunctionKey, KEY_F5 },
    { NSF6FunctionKey, KEY_F6 },
    { NSF7FunctionKey, KEY_F7 },
    { NSF8FunctionKey, KEY_F8 },
    { NSF9FunctionKey, KEY_F9 },
    { NSF10FunctionKey, KEY_F10 },
    { NSF11FunctionKey, KEY_F11 },
    { NSF12FunctionKey, KEY_F12 },
    { NSHomeFunctionKey, KEY_HOME },
    { NSEndFunctionKey, KEY_END },
    { NSPageUpFunctionKey, KEY_PAGEUP },
    { NSPageDownFunctionKey, KEY_PAGEDOWN },
    { NSTabCharacter, KEY_TAB },
    { NSCarriageReturnCharacter, KEY_ENTER },
    { NSEnterCharacter, KEY_ENTER },
    { NSBackspaceCharacter, KEY_BACKSPACE },
    { (unichar) ' ', KEY_SPACE },
    { (unichar) 0x1b, KEY_ESC },
    {0,0}
};

374
unichar VLCKeyToCocoa( unsigned int i_key )
375
{
376 377 378 379 380 381 382 383 384 385 386 387 388 389 390
    unsigned int i;
    
    for( i = 0; nskeys_to_vlckeys[i].i_vlckey != 0; i++ )
    {
        if( nskeys_to_vlckeys[i].i_vlckey == (i_key & ~KEY_MODIFIER) )
        {
            return nskeys_to_vlckeys[i].i_nskey;
        }
    }
    return (unichar)(i_key & ~KEY_MODIFIER);
}

unsigned int CocoaKeyToVLC( unichar i_key )
{
    unsigned int i;
391 392 393 394 395 396 397 398
    
    for( i = 0; nskeys_to_vlckeys[i].i_nskey != 0; i++ )
    {
        if( nskeys_to_vlckeys[i].i_nskey == i_key )
        {
            return nskeys_to_vlckeys[i].i_vlckey;
        }
    }
399 400 401 402 403 404 405 406 407 408 409 410 411 412 413
    return (unsigned int)i_key;
}

unsigned int VLCModifiersToCocoa( unsigned int i_key )
{
    unsigned int new = 0;
    if( i_key & KEY_MODIFIER_COMMAND )
        new |= NSCommandKeyMask;
    if( i_key & KEY_MODIFIER_ALT )
        new |= NSAlternateKeyMask;
    if( i_key & KEY_MODIFIER_SHIFT )
        new |= NSShiftKeyMask;
    if( i_key & KEY_MODIFIER_CTRL )
        new |= NSControlKeyMask;
    return new;
414 415
}

416 417 418 419 420
/*****************************************************************************
 * VLCMain implementation 
 *****************************************************************************/
@implementation VLCMain

421 422
- (void)awakeFromNib
{
hartman's avatar
hartman committed
423
    unsigned int i_key = 0;
424
    intf_thread_t * p_intf = [NSApp getIntf];
425
    playlist_t *p_playlist;
426
    vlc_value_t val;
hartman's avatar
hartman committed
427

428
    [self initStrings];
hartman's avatar
hartman committed
429
    [o_window setExcludedFromWindowsMenu: TRUE];
430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459
    [o_msgs_panel setExcludedFromWindowsMenu: TRUE];
    [o_msgs_panel setDelegate: self];
    
    i_key = config_GetInt( p_intf, "key-quit" );
    [o_mi_quit setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_quit setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-play-pause" );
    [o_mi_play setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_play setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-stop" );
    [o_mi_stop setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_stop setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-faster" );
    [o_mi_faster setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_faster setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-slower" );
    [o_mi_slower setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_slower setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-prev" );
    [o_mi_previous setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_previous setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-next" );
    [o_mi_next setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_next setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-jump+10sec" );
    [o_mi_fwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_fwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-jump-10sec" );
    [o_mi_bwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_bwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
460 461 462 463 464 465 466 467 468 469 470 471
    i_key = config_GetInt( p_intf, "key-jump+1min" );
    [o_mi_fwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_fwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-jump-1min" );
    [o_mi_bwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_bwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-jump+5min" );
    [o_mi_fwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_fwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-jump-5min" );
    [o_mi_bwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_bwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
472 473 474 475 476 477
    i_key = config_GetInt( p_intf, "key-vol-up" );
    [o_mi_vol_up setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_vol_up setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
    i_key = config_GetInt( p_intf, "key-vol-down" );
    [o_mi_vol_down setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_vol_down setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
hartman's avatar
hartman committed
478 479 480
    i_key = config_GetInt( p_intf, "key-vol-mute" );
    [o_mi_mute setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_mute setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
481 482 483 484
    i_key = config_GetInt( p_intf, "key-fullscreen" );
    [o_mi_fullscreen setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
    [o_mi_fullscreen setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];

485
    var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
486

487 488
    [self setSubmenusEnabled: FALSE];
    [self manageVolumeSlider];
hartman's avatar
hartman committed
489
    
490 491 492
    p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
    
    if( p_playlist )
hartman's avatar
hartman committed
493
    {
494 495
        /* Check if we need to start playing */
        if( p_intf->b_play )
hartman's avatar
hartman committed
496 497 498
        {
            playlist_Play( p_playlist );
        }
499 500 501 502

        var_Get( p_playlist, "fullscreen", &val );
        [o_btn_fullscreen setState: val.b_bool];
        vlc_object_release( p_playlist );
hartman's avatar
hartman committed
503
    }
504 505
}

hartman's avatar
hartman committed
506
- (void)initStrings
507 508
{
    [o_window setTitle: _NS("VLC - Controller")];
509
    [o_scrollfield setStringValue: _NS("VLC media player")];
510

Jon Lech Johansen's avatar
Jon Lech Johansen committed
511 512
    /* button controls */
    [o_btn_prev setToolTip: _NS("Previous")];
hartman's avatar
hartman committed
513
    [o_btn_rewind setToolTip: _NS("Rewind")];
Jon Lech Johansen's avatar
Jon Lech Johansen committed
514 515
    [o_btn_play setToolTip: _NS("Play")];
    [o_btn_stop setToolTip: _NS("Stop")];
hartman's avatar
hartman committed
516
    [o_btn_ff setToolTip: _NS("Fast Forward")];
Jon Lech Johansen's avatar
Jon Lech Johansen committed
517
    [o_btn_next setToolTip: _NS("Next")];
hartman's avatar
hartman committed
518
    [o_btn_fullscreen setToolTip: _NS("Fullscreen")];
hartman's avatar
hartman committed
519 520
    [o_volumeslider setToolTip: _NS("Volume")];
    [o_timeslider setToolTip: _NS("Position")];
521

Jon Lech Johansen's avatar
Jon Lech Johansen committed
522
    /* messages panel */ 
523
    [o_msgs_panel setTitle: _NS("Messages")];
524
    [o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
525

Jon Lech Johansen's avatar
Jon Lech Johansen committed
526
    /* main menu */
527
    [o_mi_about setTitle: _NS("About VLC media player")];
528
    [o_mi_prefs setTitle: _NS("Preferences...")];
hartman's avatar
hartman committed
529 530
    [o_mi_add_intf setTitle: _NS("Add Interface")];
    [o_mu_add_intf setTitle: _NS("Add Interface")];
531
    [o_mi_hide setTitle: _NS("Hide VLC")];
532 533
    [o_mi_hide_others setTitle: _NS("Hide Others")];
    [o_mi_show_all setTitle: _NS("Show All")];
534
    [o_mi_quit setTitle: _NS("Quit VLC")];
535

hartman's avatar
ALL:  
hartman committed
536
    [o_mu_file setTitle: _ANS("1:File")];
hartman's avatar
hartman committed
537 538
    [o_mi_open_generic setTitle: _NS("Open File...")];
    [o_mi_open_file setTitle: _NS("Quick Open File...")];
539 540
    [o_mi_open_disc setTitle: _NS("Open Disc...")];
    [o_mi_open_net setTitle: _NS("Open Network...")];
541 542 543 544 545 546 547 548 549 550 551
    [o_mi_open_recent setTitle: _NS("Open Recent")];
    [o_mi_open_recent_cm setTitle: _NS("Clear Menu")];

    [o_mu_edit setTitle: _NS("Edit")];
    [o_mi_cut setTitle: _NS("Cut")];
    [o_mi_copy setTitle: _NS("Copy")];
    [o_mi_paste setTitle: _NS("Paste")];
    [o_mi_clear setTitle: _NS("Clear")];
    [o_mi_select_all setTitle: _NS("Select All")];

    [o_mu_controls setTitle: _NS("Controls")];
552
    [o_mi_play setTitle: _NS("Play")];
553 554 555
    [o_mi_stop setTitle: _NS("Stop")];
    [o_mi_faster setTitle: _NS("Faster")];
    [o_mi_slower setTitle: _NS("Slower")];
Christophe Massiot's avatar
Christophe Massiot committed
556
    [o_mi_previous setTitle: _NS("Previous")];
557
    [o_mi_next setTitle: _NS("Next")];
558 559 560
    [o_mi_random setTitle: _NS("Random")];
    [o_mi_repeat setTitle: _NS("Repeat One")];
    [o_mi_loop setTitle: _NS("Repeat All")];
561 562
    [o_mi_fwd setTitle: _NS("Step Forward")];
    [o_mi_bwd setTitle: _NS("Step Backward")];
563

hartman's avatar
hartman committed
564
    [o_mi_program setTitle: _NS("Program")];
565
    [o_mu_program setTitle: _NS("Program")];
hartman's avatar
hartman committed
566
    [o_mi_title setTitle: _NS("Title")];
567
    [o_mu_title setTitle: _NS("Title")];
hartman's avatar
hartman committed
568
    [o_mi_chapter setTitle: _NS("Chapter")];
569
    [o_mu_chapter setTitle: _NS("Chapter")];
hartman's avatar
hartman committed
570 571
    
    [o_mu_audio setTitle: _NS("Audio")];
Jon Lech Johansen's avatar
Jon Lech Johansen committed
572 573
    [o_mi_vol_up setTitle: _NS("Volume Up")];
    [o_mi_vol_down setTitle: _NS("Volume Down")];
574
    [o_mi_mute setTitle: _NS("Mute")];
575 576 577 578 579 580
    [o_mi_audiotrack setTitle: _NS("Audio Track")];
    [o_mu_audiotrack setTitle: _NS("Audio Track")];
    [o_mi_channels setTitle: _NS("Audio Channels")];
    [o_mu_channels setTitle: _NS("Audio Channels")];
    [o_mi_device setTitle: _NS("Audio Device")];
    [o_mu_device setTitle: _NS("Audio Device")];
581 582
    [o_mi_visual setTitle: _NS("Visualizations")];
    [o_mu_visual setTitle: _NS("Visualizations")];
hartman's avatar
hartman committed
583 584
    
    [o_mu_video setTitle: _NS("Video")];
585 586 587
    [o_mi_half_window setTitle: _NS("Half Size")];
    [o_mi_normal_window setTitle: _NS("Normal Size")];
    [o_mi_double_window setTitle: _NS("Double Size")];
588
    [o_mi_fittoscreen setTitle: _NS("Fit to Screen")];
589
    [o_mi_fullscreen setTitle: _NS("Fullscreen")];
590 591 592 593 594 595 596
    [o_mi_floatontop setTitle: _NS("Float on Top")];
    [o_mi_videotrack setTitle: _NS("Video Track")];
    [o_mu_videotrack setTitle: _NS("Video Track")];
    [o_mi_screen setTitle: _NS("Video Device")];
    [o_mu_screen setTitle: _NS("Video Device")];
    [o_mi_subtitle setTitle: _NS("Subtitles Track")];
    [o_mu_subtitle setTitle: _NS("Subtitles Track")];
597
    [o_mi_deinterlace setTitle: _NS("Deinterlace")];
598
    [o_mu_deinterlace setTitle: _NS("Deinterlace")];
599 600

    [o_mu_window setTitle: _NS("Window")];
601 602
    [o_mi_minimize setTitle: _NS("Minimize Window")];
    [o_mi_close_window setTitle: _NS("Close Window")];
hartman's avatar
hartman committed
603 604
    [o_mi_controller setTitle: _NS("Controller")];
    [o_mi_playlist setTitle: _NS("Playlist")];
605
    [o_mi_info setTitle: _NS("Info")];
hartman's avatar
hartman committed
606 607
    [o_mi_messages setTitle: _NS("Messages")];

608 609
    [o_mi_bring_atf setTitle: _NS("Bring All to Front")];

610 611
    [o_mu_help setTitle: _NS("Help")];
    [o_mi_readme setTitle: _NS("ReadMe...")];
hartman's avatar
hartman committed
612
    [o_mi_documentation setTitle: _NS("Online Documentation")];
613
    [o_mi_reportabug setTitle: _NS("Report a Bug")];
614 615 616
    [o_mi_website setTitle: _NS("VideoLAN Website")];
    [o_mi_license setTitle: _NS("License")];

617
    /* dock menu */
618
    [o_dmi_play setTitle: _NS("Play")];
619
    [o_dmi_stop setTitle: _NS("Stop")];
620 621
    [o_dmi_next setTitle: _NS("Next")];
    [o_dmi_previous setTitle: _NS("Previous")];
622
    [o_dmi_mute setTitle: _NS("Mute")];
623

624 625
    /* error panel */
    [o_error setTitle: _NS("Error")];
626 627
    [o_err_lbl setStringValue: _NS("An error has occurred which probably prevented the execution of your request:")];
    [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")]; 
628 629
    [o_err_btn_msgs setTitle: _NS("Open Messages Window")];
    [o_err_btn_dismiss setTitle: _NS("Dismiss")];
630
    [o_err_ckbk_surpress setTitle: _NS("Suppress further errors")];
631

632
    [o_info_window setTitle: _NS("Info")];
633 634 635 636 637 638
}

- (void)applicationWillFinishLaunching:(NSNotification *)o_notification
{
    intf_thread_t * p_intf = [NSApp getIntf];

639 640 641
    o_msg_lock = [[NSLock alloc] init];
    o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain];

642
    o_img_play = [[NSImage imageNamed: @"play"] retain];
hartman's avatar
hartman committed
643
    o_img_play_pressed = [[NSImage imageNamed: @"play_blue"] retain];
644
    o_img_pause = [[NSImage imageNamed: @"pause"] retain];
hartman's avatar
hartman committed
645
    o_img_pause_pressed = [[NSImage imageNamed: @"pause_blue"] retain];
646 647 648 649 650

    [p_intf->p_sys->o_sendport setDelegate: self];
    [[NSRunLoop currentRunLoop] 
        addPort: p_intf->p_sys->o_sendport
        forMode: NSDefaultRunLoopMode];
651

652
    [NSTimer scheduledTimerWithTimeInterval: 0.5
653
        target: self selector: @selector(manageIntf:)
654
        userInfo: nil repeats: FALSE];
655 656 657

    [NSThread detachNewThreadSelector: @selector(manage)
        toTarget: self withObject: nil];
hartman's avatar
hartman committed
658 659 660
        
    [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
        var: "intf-add" selector: @selector(toggleVar:)];
661 662

    vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
663 664
}

665 666
- (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename
{
667
    NSDictionary *o_dic = [NSDictionary dictionaryWithObjectsAndKeys: o_filename, @"ITEM_URL", nil];
668
    [o_playlist appendArray:
669
        [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO];
hartman's avatar
hartman committed
670
            
671 672 673
    return( TRUE );
}

hartman's avatar
hartman committed
674 675 676 677 678 679 680 681 682
- (id)getControls
{
    if ( o_controls )
    {
        return o_controls;
    }
    return nil;
}

hartman's avatar
hartman committed
683 684 685 686 687 688 689 690 691
- (id)getPlaylist
{
    if ( o_playlist )
    {
        return o_playlist;
    }
    return nil;
}

692 693 694 695 696 697
- (void)manage
{
    NSDate * o_sleep_date;
    intf_thread_t * p_intf = [NSApp getIntf];
    NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];

698 699
    vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );

700 701
    while( !p_intf->b_die )
    {
702
        playlist_t * p_playlist;
703
        vlc_value_t val;
704 705
        vlc_mutex_lock( &p_intf->change_lock );

706 707 708 709
        p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, 
                                              FIND_ANYWHERE );

        if( p_playlist != NULL )
710
        {
711
            var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
712
            var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
hartman's avatar
hartman committed
713
            var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
714

hartman's avatar
hartman committed
715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743
#define p_input p_playlist->p_input
        
            if( p_input )
            {
                if( !p_input->b_die )
                {
                    vlc_value_t val;

                    /* New input or stream map change */
                    if( p_input->stream.b_changed )
                    {
                        msg_Dbg( p_intf, "stream has changed, refreshing interface" );
                        p_intf->p_sys->b_playing = TRUE;
                        p_intf->p_sys->b_current_title_update = 1;
                        p_input->stream.b_changed = 0;
                        p_intf->p_sys->b_intf_update = TRUE;
                    }

                    if( var_Get( (vlc_object_t *)p_input, "intf-change", &val )
                        >= 0 && val.b_bool )
                    {
                        p_intf->p_sys->b_input_update = TRUE;
                    }
                }
            }
            else if( p_intf->p_sys->b_playing && !p_intf->b_die )
            {
                p_intf->p_sys->b_playing = FALSE;
            }
hartman's avatar
hartman committed
744
            
hartman's avatar
hartman committed
745
#undef p_input
746
            vlc_object_release( p_playlist );
747 748 749 750 751 752 753 754

            if( var_Get( p_intf, "intf-change", &val )
                        >= 0 && val.b_bool )
            {
                p_intf->p_sys->b_fullscreen_update = TRUE;
            }
            val.b_bool = VLC_FALSE;
            var_Set( p_intf,"intf-change",val);
755
        }
756

757
        vlc_mutex_unlock( &p_intf->change_lock );
758

759
        o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .5];
760 761
        [NSThread sleepUntilDate: o_sleep_date];
    }
762

763 764 765 766 767 768 769 770 771 772 773 774 775
    [self terminate];
    [o_pool release];
}

- (void)manageIntf:(NSTimer *)o_timer
{
    intf_thread_t * p_intf = [NSApp getIntf];

    if( p_intf->p_vlc->b_die == VLC_TRUE )
    {
        [o_timer invalidate];
        return;
    }
776

777 778 779 780 781 782 783 784
    playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
                                                       FIND_ANYWHERE );

    if( p_playlist == NULL )
    {
        return;
    }

hartman's avatar
hartman committed
785 786 787 788 789
    if ( p_intf->p_sys->b_playlist_update )
    {
        [o_playlist playlistUpdated];
        p_intf->p_sys->b_playlist_update = VLC_FALSE;
    }
790

hartman's avatar
ALL:  
hartman committed
791 792
    if( p_intf->p_sys->b_current_title_update )
    {
793 794 795 796 797
        vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
                                                FIND_ANYWHERE );

        vlc_mutex_lock( &p_playlist->object_lock );
        [o_scrollfield setStringValue: [NSString stringWithUTF8String: 
798
            p_playlist->pp_items[p_playlist->i_index]->input.psz_name]]; 
799 800
        vlc_mutex_unlock( &p_playlist->object_lock );

801
        if( p_vout != NULL )
hartman's avatar
ALL:  
hartman committed
802
        {
803
            id o_vout_wnd;
804
            NSEnumerator * o_enum = [[NSApp orderedWindows] objectEnumerator];
805 806
            
            while( ( o_vout_wnd = [o_enum nextObject] ) )
hartman's avatar
ALL:  
hartman committed
807
            {
808 809 810 811
                if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
                {
                    [o_vout_wnd updateTitle];
                }
hartman's avatar
ALL:  
hartman committed
812
            }
813
            vlc_object_release( (vlc_object_t *)p_vout );
hartman's avatar
ALL:  
hartman committed
814
        }
815 816 817
        [o_playlist updateRowSelection];
        [o_info updateInfo];

hartman's avatar
ALL:  
hartman committed
818 819
        p_intf->p_sys->b_current_title_update = FALSE;
    }
820

821 822 823 824
    vlc_mutex_lock( &p_playlist->object_lock );

#define p_input p_playlist->p_input

825 826 827 828 829 830 831 832 833 834 835
    if( p_intf->p_sys->b_intf_update )
    {
        vlc_bool_t b_input = VLC_FALSE;
        vlc_bool_t b_plmul = VLC_FALSE;
        vlc_bool_t b_control = VLC_FALSE;
        vlc_bool_t b_seekable = VLC_FALSE;
        vlc_bool_t b_chapters = VLC_FALSE;

        b_plmul = p_playlist->i_size > 1;

        if( ( b_input = ( p_input != NULL ) ) )
836
        {
837 838
            vlc_mutex_lock( &p_input->stream.stream_lock );

839 840
            /* seekable streams */
            b_seekable = p_input->stream.b_seekable;
841

842
            /* check wether slow/fast motion is possible*/
843
            b_control = p_input->stream.b_pace_control; 
844

hartman's avatar
hartman committed
845 846
            /* chapters & titles */
            b_chapters = p_input->stream.i_area_nb > 1; 
hartman's avatar
hartman committed
847 848
 
            vlc_mutex_unlock( &p_input->stream.stream_lock );
849 850 851
        }

        [o_btn_stop setEnabled: b_input];
852 853
        [o_btn_ff setEnabled: b_seekable];
        [o_btn_rewind setEnabled: b_seekable];
854 855 856 857 858 859 860 861 862 863 864
        [o_btn_prev setEnabled: (b_plmul || b_chapters)];
        [o_btn_next setEnabled: (b_plmul || b_chapters)];

        [o_timeslider setFloatValue: 0.0];
        [o_timeslider setEnabled: b_seekable];
        [o_timefield setStringValue: @"0:00:00"];

        [self manageVolumeSlider];
        p_intf->p_sys->b_intf_update = VLC_FALSE;
    }

865
    if( p_intf->p_sys->b_fullscreen_update )
866 867
    {
        vout_thread_t * p_vout;
868
        vlc_value_t val;
869
        if( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )
870 871 872 873 874 875 876
        {
            [o_btn_fullscreen setState:VLC_TRUE];
        }
        else
        {
            [o_btn_fullscreen setState:VLC_FALSE];
        }
877 878
        p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
        if( p_vout != NULL )
879
        {
880
            [o_btn_fullscreen setEnabled: VLC_TRUE];
881
            vlc_object_release( p_vout );
882 883 884
        }
        else
        {
885
            [o_btn_fullscreen setEnabled: VLC_FALSE];
886
        }
887
        p_intf->p_sys->b_fullscreen_update = VLC_FALSE;
888 889
    }

890 891
    if( p_intf->p_sys->b_playing && p_input != NULL )
    {
hartman's avatar
hartman committed
892
        vlc_value_t time;
hartman's avatar
hartman committed
893 894
        NSString * o_time;
        mtime_t i_seconds;
895 896 897

        if( p_input->stream.b_seekable )
        {
hartman's avatar
hartman committed
898 899 900 901 902
            vlc_value_t pos;
            float f_updated;
            
            var_Get( p_input, "position", &pos );
            f_updated = 10000. * pos.f_float;
903

hartman's avatar
hartman committed
904
            if( f_slider != f_updated )
905
            {
hartman's avatar
hartman committed
906
                [o_timeslider setFloatValue: f_updated];
907
            }
908
        }
hartman's avatar
hartman committed
909 910 911 912 913 914 915 916 917
            
        var_Get( p_input, "time", &time );
        i_seconds = time.i_time / 1000000;
        
        o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
                        (int) (i_seconds / (60 * 60)),
                        (int) (i_seconds / 60 % 60),
                        (int) (i_seconds % 60)];
        [o_timefield setStringValue: o_time];
hartman's avatar
hartman committed
918 919 920 921 922
    }
    if( p_input )
    {
        vlc_value_t val;
        var_Get( p_input, "state", &val );
923

hartman's avatar
hartman committed
924 925 926 927 928 929 930 931 932 933 934 935 936 937 938
        if( val.i_int != PAUSE_S )
        {
            p_intf->p_sys->b_play_status = TRUE;
        }
        else
        {
            p_intf->p_sys->b_play_status = FALSE;
        }
        [self playStatusUpdated: p_intf->p_sys->b_play_status];
    }
    else
    {
        p_intf->p_sys->b_play_status = FALSE;
        [self playStatusUpdated: p_intf->p_sys->b_play_status];
        [self setSubmenusEnabled: FALSE];
939 940
    }

941 942 943 944 945 946
#undef p_input

    vlc_mutex_unlock( &p_playlist->object_lock );
    vlc_object_release( p_playlist );

    [self updateMessageArray];
947 948 949 950

    [NSTimer scheduledTimerWithTimeInterval: 0.5
        target: self selector: @selector(manageIntf:)
        userInfo: nil repeats: FALSE];
951 952
}

hartman's avatar
* ALL:  
hartman committed
953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990
- (void)setupMenus
{
    intf_thread_t * p_intf = [NSApp getIntf];
    playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, 
                                                FIND_ANYWHERE );
    
    if( p_playlist != NULL )
    {
#define p_input p_playlist->p_input
        if( p_input != NULL )
        {
            [o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input
                var: "program" selector: @selector(toggleVar:)];
            
            [o_controls setupVarMenuItem: o_mi_title target: (vlc_object_t *)p_input
                var: "title" selector: @selector(toggleVar:)];
            
            [o_controls setupVarMenuItem: o_mi_chapter target: (vlc_object_t *)p_input
                var: "chapter" selector: @selector(toggleVar:)];
            
            [o_controls setupVarMenuItem: o_mi_audiotrack target: (vlc_object_t *)p_input
                var: "audio-es" selector: @selector(toggleVar:)];
            
            [o_controls setupVarMenuItem: o_mi_videotrack target: (vlc_object_t *)p_input
                var: "video-es" selector: @selector(toggleVar:)];
            
            [o_controls setupVarMenuItem: o_mi_subtitle target: (vlc_object_t *)p_input
                var: "spu-es" selector: @selector(toggleVar:)];
        
            aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
                                                        FIND_ANYWHERE );
            if ( p_aout != NULL )
            {
                [o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout
                    var: "audio-channels" selector: @selector(toggleVar:)];
            
                [o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout
                    var: "audio-device" selector: @selector(toggleVar:)];
991 992 993
                    
                [o_controls setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
                    var: "visual" selector: @selector(toggleVar:)];
hartman's avatar
* ALL:  
hartman committed
994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014
                vlc_object_release( (vlc_object_t *)p_aout );
            }
            
            vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
                                                                FIND_ANYWHERE );
            
            if ( p_vout != NULL )
            {
                [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
                    var: "video-device" selector: @selector(toggleVar:)];
                
                [o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout
                    var: "deinterlace" selector: @selector(toggleVar:)];
                vlc_object_release( (vlc_object_t *)p_vout );
            }
        }
#undef p_input
    }
    vlc_object_release( (vlc_object_t *)p_playlist );
}

1015
- (void)updateMessageArray
1016
{
1017 1018
    int i_start, i_stop;
    intf_thread_t * p_intf = [NSApp getIntf];
1019
    vlc_value_t quiet;
1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047

    vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
    i_stop = *p_intf->p_sys->p_sub->pi_stop;
    vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock );

    if( p_intf->p_sys->p_sub->i_start != i_stop )
    {
        NSColor *o_white = [NSColor whiteColor];
        NSColor *o_red = [NSColor redColor];
        NSColor *o_yellow = [NSColor yellowColor];
        NSColor *o_gray = [NSColor grayColor];

        NSColor * pp_color[4] = { o_white, o_red, o_yellow, o_gray };
        static const char * ppsz_type[4] = { ": ", " error: ",
                                             " warning: ", " debug: " };

        for( i_start = p_intf->p_sys->p_sub->i_start;
             i_start != i_stop;
             i_start = (i_start+1) % VLC_MSG_QSIZE )
        {
            NSString *o_msg;
            NSDictionary *o_attr;
            NSAttributedString *o_msg_color;

            int i_type = p_intf->p_sys->p_sub->p_msg[i_start].i_type;

            [o_msg_lock lock];

1048
            if( [o_msg_arr count] + 2 > 400 )
1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073
            {
                unsigned rid[] = { 0, 1 };
                [o_msg_arr removeObjectsFromIndices: (unsigned *)&rid
                           numIndices: sizeof(rid)/sizeof(rid[0])];
            }

            o_attr = [NSDictionary dictionaryWithObject: o_gray
                forKey: NSForegroundColorAttributeName];
            o_msg = [NSString stringWithFormat: @"%s%s",
                p_intf->p_sys->p_sub->p_msg[i_start].psz_module,
                ppsz_type[i_type]];
            o_msg_color = [[NSAttributedString alloc]
                initWithString: o_msg attributes: o_attr];
            [o_msg_arr addObject: [o_msg_color autorelease]];

            o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type]
                forKey: NSForegroundColorAttributeName];
            o_msg = [NSString stringWithFormat: @"%s\n",
                p_intf->p_sys->p_sub->p_msg[i_start].psz_msg];
            o_msg_color = [[NSAttributedString alloc]
                initWithString: o_msg attributes: o_attr];
            [o_msg_arr addObject: [o_msg_color autorelease]];

            [o_msg_lock unlock];

1074 1075 1076
            var_Get( p_intf->p_vlc, "verbose", &quiet );

            if( i_type == 1 && quiet.i_int > -1 )
1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094