Skip to content

V
vlc-2-2
Commit 18949ec8 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* modules/demux/mkv.cpp: Set English as the default for track language. 

* modules/gui/macosx/vout.m: removed debug
* modules/gui/macosx/open.m: Panther compilation fixes
* modules/gui/macosx/controls.m: OSDMessages :)
parent 2ec1057c
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 11 deletions
modules/demux/mkv.cpp
View file @ 18949ec8
......@@ -2,7 +2,7 @@
* mkv.cpp : matroska demuxer
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: mkv.cpp,v 1.31 2003/10/30 00:12:02 sigmunau Exp $
* $Id: mkv.cpp,v 1.32 2003/10/31 15:54:52 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -497,7 +497,7 @@ static int Open( vlc_object_t * p_this )
tk.p_extra_data = NULL;
tk.i_codec = 0;
tk.psz_codec = NULL;
tk.psz_language = NULL;
tk.psz_language = "English";
tk.i_default_duration = 0;
tk.f_timecodescale = 1.0;
......
modules/gui/macosx/controls.m
View file @ 18949ec8
......@@ -2,7 +2,7 @@
* controls.m: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: controls.m,v 1.49 2003/09/20 19:37:53 hartman Exp $
* $Id: controls.m,v 1.50 2003/10/31 15:54:53 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -34,6 +34,7 @@
#include "vout.h"
#include "open.h"
#include "controls.h"
#include <osd.h>
/*****************************************************************************
* VLCControls implementation
......@@ -53,6 +54,7 @@
if( playlist_IsPlaying( p_playlist ) )
{
vout_OSDMessage( p_intf, _( "Pause" ) );
playlist_Pause( p_playlist );
vlc_object_release( p_playlist );
}
......@@ -61,6 +63,7 @@
if( !playlist_IsEmpty( p_playlist ) )
{
playlist_Play( p_playlist );
vout_OSDMessage( p_intf, _( "Play" ) );
vlc_object_release( p_playlist );
}
else
......@@ -78,6 +81,7 @@
FIND_ANYWHERE );
if( p_playlist != NULL )
{
vout_OSDMessage( p_intf, _( "Stop" ) );
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
}
......@@ -93,6 +97,7 @@
vlc_value_t val; val.b_bool = VLC_TRUE;
var_Set( p_input, "rate-faster", val );
vout_OSDMessage( p_intf, _( "Faster" ) );
vlc_object_release( p_input );
}
}
......@@ -107,6 +112,7 @@
vlc_value_t val; val.b_bool = VLC_TRUE;
var_Set( p_input, "rate-slower", val );
vout_OSDMessage( p_intf, _( "Slower" ) );
vlc_object_release( p_input );
}
}
......@@ -157,6 +163,7 @@
#undef p_area
vlc_object_release( p_playlist );
vout_OSDMessage( p_intf, _( "Previous" ) );
}
- (IBAction)next:(id)sender
......@@ -205,6 +212,7 @@
#undef p_area
vlc_object_release( p_playlist );
vout_OSDMessage( p_intf, _( "Next" ) );
}
- (IBAction)random:(id)sender
......@@ -221,6 +229,14 @@
var_Get( p_playlist, "random", &val );
val.b_bool = !val.b_bool;
var_Set( p_playlist, "random", val );
if( val.b_bool )
{
vout_OSDMessage( p_intf, _( "Shuffle On" ) );
}
else
{
vout_OSDMessage( p_intf, _( "Shuffle Off" ) );
}
vlc_object_release( p_playlist );
}
......@@ -239,6 +255,14 @@
var_Get( p_playlist, "repeat", &val );
val.b_bool = !val.b_bool;
var_Set( p_playlist, "repeat", val );
if( val.b_bool )
{
vout_OSDMessage( p_intf, _( "Repeat On" ) );
}
else
{
vout_OSDMessage( p_intf, _( "Repeat Off" ) );
}
vlc_object_release( p_playlist );
}
......@@ -257,6 +281,14 @@
var_Get( p_playlist, "loop", &val );
val.b_bool = !val.b_bool;
var_Set( p_playlist, "loop", val );
if( val.b_bool )
{
vout_OSDMessage( p_intf, _( "Loop On" ) );
}
else
{
vout_OSDMessage( p_intf, _( "Loop Off" ) );
}
vlc_object_release( p_playlist );
}
......@@ -340,10 +372,14 @@
{
intf_thread_t * p_intf = [NSApp getIntf];
audio_volume_t i_volume;
char string[9];
aout_VolumeGet( p_intf, &i_volume );
[o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)];
[o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)];
sprintf( string, "Vol %d%%", i_volume*100/AOUT_VOLUME_MAX );
vout_OSDMessage( p_intf, string );
}
- (IBAction)windowAction:(id)sender
......
modules/gui/macosx/open.m
View file @ 18949ec8
......@@ -2,7 +2,7 @@
* open.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: open.m,v 1.39 2003/10/19 23:12:16 hartman Exp $
* $Id: open.m,v 1.40 2003/10/31 15:54:53 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -67,7 +67,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
return( nil );
}
CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectable ),
CFDictionarySetValue( classes_to_match, CFSTR( kIOMediaEjectableKey ),
kCFBooleanTrue );
kern_result = IOServiceGetMatchingServices( master_port, classes_to_match,
......@@ -89,7 +89,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
do
{
str_bsd_path = IORegistryEntryCreateCFProperty( next_media,
CFSTR( kIOBSDName ),
CFSTR( kIOBSDNameKey ),
kCFAllocatorDefault,
0 );
if( str_bsd_path == NULL )
......
modules/gui/macosx/vout.m
View file @ 18949ec8
......@@ -3,7 +3,7 @@
* vout.m: MacOS X video output plugin
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: vout.m,v 1.60 2003/10/30 22:34:48 hartman Exp $
* $Id: vout.m,v 1.61 2003/10/31 15:54:53 hartman Exp $
*
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
......@@ -1000,15 +1000,12 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
if( i_pressed_modifiers & NSCommandKeyMask )
val.i_int |= KEY_MODIFIER_COMMAND;
NSLog( @"detected the modifiers: %x", i_pressed_modifiers );
key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
if( key )
{
val.i_int |= CocoaConvertKey( key );
var_Set( p_vout->p_vlc, "key-pressed", val );
NSLog( @"detected the key: %x", key );
}
else
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment