Commit ccfd28dd authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* code we migh use in the future to change the subfile we use.

  not very useful now because of the .avi requirement to start/stop before
  loading/displaying the subs.
parent f33d74bc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* controls.m: MacOS X interface plugin * controls.m: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: controls.m,v 1.13 2003/01/24 00:53:41 hartman Exp $ * $Id: controls.m,v 1.14 2003/01/24 16:19:15 hartman Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -464,6 +464,26 @@ ...@@ -464,6 +464,26 @@
NSMenuItem * o_mi = (NSMenuItem *)sender; NSMenuItem * o_mi = (NSMenuItem *)sender;
intf_thread_t * p_intf = [NSApp getIntf]; intf_thread_t * p_intf = [NSApp getIntf];
#if 0
/* We do not use this code, because you need to start stop .avi for
* it to work, so not very useful now --hartman */
if ( [o_mi state] == NSOffState && [o_mi tag] == 2000 )
{
NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
[o_open_panel setAllowsMultipleSelection: NO];
[o_open_panel setTitle: _NS("Open subtitlefile")];
[o_open_panel setPrompt: _NS("Open")];
if( [o_open_panel runModalForDirectory: nil
file: nil types: nil] == NSOKButton )
{
NSString *o_filename = [[o_open_panel filenames] objectAtIndex: 0];
config_PutPsz( p_intf, "sub-file", strdup( [o_filename cString] ));
}
}
#endif
#define p_input p_intf->p_sys->p_input #define p_input p_intf->p_sys->p_input
if( !p_intf->p_sys->b_audio_update ) if( !p_intf->p_sys->b_audio_update )
...@@ -511,7 +531,7 @@ ...@@ -511,7 +531,7 @@
- (IBAction)toggleVar:(id)sender - (IBAction)toggleVar:(id)sender
{ {
NSMenuItem * o_mi = (NSMenuItem *)sender; NSMenuItem * o_mi = (NSMenuItem *)sender;
if( [o_mi state] == NSOffState ) if( [o_mi state] == NSOffState )
{ {
const char * psz_variable = (const char *)[o_mi tag]; const char * psz_variable = (const char *)[o_mi tag];
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin * intf.m: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: intf.m,v 1.32 2003/01/23 22:25:32 hartman Exp $ * $Id: intf.m,v 1.33 2003/01/24 16:19:15 hartman Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -938,6 +938,22 @@ static void Run( intf_thread_t *p_intf ) ...@@ -938,6 +938,22 @@ static void Run( intf_thread_t *p_intf )
* always sensitive. --Meuuh */ * always sensitive. --Meuuh */
[o_mi setEnabled: TRUE]; [o_mi setEnabled: TRUE];
#if 0
/* We do not use this code, because you need to start stop .avi for
* it to work, so not very useful now --hartman */
if ( o_mi == o_mi_subtitle ) {
NSLog(@"testing");
[o_mi setEnabled: TRUE ];
NSMenuItem * o_lmi;
NSString * o_title;
o_title = _NS("Load from file..");
o_lmi = [o_menu addItemWithTitle: o_title
action: pf_callback keyEquivalent: @""];
[o_lmi setTag: 2000];
[o_lmi setTarget: o_controls];
}
#endif
vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock ); vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
#define ES p_intf->p_sys->p_input->stream.pp_es[i] #define ES p_intf->p_sys->p_input->stream.pp_es[i]
...@@ -1015,7 +1031,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -1015,7 +1031,7 @@ static void Run( intf_thread_t *p_intf )
} }
/* make (un)sensitive */ /* make (un)sensitive */
[o_mi setEnabled: (val.p_list->i_count > 0)]; [o_mi setEnabled: ( val.p_list->i_count > 0 )];
for ( i = 0; i < val.p_list->i_count; i++ ) for ( i = 0; i < val.p_list->i_count; i++ )
{ {
......
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