Commit 1da43777 authored by Christophe Massiot's avatar Christophe Massiot

* Bumped up revision number to 0.5.0-test2,

* MacOS X port: new error dialog displaying error messages,
* Updated localization files,
* Comestic fixes.
parent 33b136e3
......@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
dnl them. And we need the comma otherwize automake will choke on it.
AM_INIT_AUTOMAKE(vlc,0.5.0-cvs)
AM_INIT_AUTOMAKE(vlc,0.5.0-test2)
AM_CONFIG_HEADER(config.h)
dnl
......
......@@ -32,6 +32,7 @@
{
ACTIONS = {
clearRecentItems = id;
closeError = id;
openRecentItem = id;
timesliderUpdate = id;
viewPreferences = id;
......@@ -52,12 +53,19 @@
"o_dmi_pause" = id;
"o_dmi_play" = id;
"o_dmi_stop" = id;
"o_err_btn_dismiss" = id;
"o_err_btn_msgs" = id;
"o_err_bug_lbl" = id;
"o_err_lbl" = id;
"o_err_msg" = id;
"o_error" = id;
"o_messages" = id;
"o_mi_about" = id;
"o_mi_bring_atf" = id;
"o_mi_channels" = id;
"o_mi_chapter" = id;
"o_mi_clear" = id;
"o_mi_close_window" = id;
"o_mi_copy" = id;
"o_mi_cut" = id;
"o_mi_deinterlace" = id;
......
......@@ -7,7 +7,7 @@
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>407 753 308 44 0 0 1600 1178 </string>
<string>355 598 308 44 0 0 1152 746 </string>
<key>303</key>
<string>93 566 72 114 0 0 1600 1178 </string>
<key>909</key>
......@@ -19,6 +19,7 @@
<string>291.0</string>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
<integer>636</integer>
</array>
<key>IBSystem Version</key>
......
......@@ -7,7 +7,7 @@
objects = {
014CEA410018CDE011CA2923 = {
isa = PBXBundleReference;
path = vlc.bundle;
path = "VLC Media Player.bundle";
refType = 3;
};
014CEA420018CDE011CA2923 = {
......@@ -44,6 +44,7 @@
014CEA420018CDE011CA2923,
014CEA430018CDE011CA2923,
);
hasScannedForEncodings = 1;
isa = PBXProject;
mainGroup = 089C166AFE841209C02AAC07;
projectDirPath = "";
......@@ -93,7 +94,7 @@
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
OTHER_REZFLAGS = "";
PRODUCT_NAME = vlc;
PRODUCT_NAME = "VLC Media Player";
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
WRAPPER_EXTENSION = bundle;
......@@ -195,12 +196,14 @@
<string>org.videolan.vlc</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>VLC Media Player</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
<string>VLC#</string>
<key>CFBundleVersion</key>
<string>0.5.0</string>
<string>0.5.0-test2</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
......@@ -208,7 +211,6 @@
</dict>
</plist>
";
shouldUseHeadermap = 1;
};
089C1674FE841209C02AAC07 = {
buildActionMask = 2147483647;
......@@ -361,6 +363,7 @@
refType = 4;
};
F69B0CA702E24F6401A80112 = {
fileEncoding = 5;
isa = PBXFileReference;
name = English;
path = Resources/English.lproj/InfoPlist.strings;
......
......@@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: intf.h,v 1.11 2003/01/05 16:23:57 massiot Exp $
* $Id: intf.h,v 1.12 2003/01/06 22:07:47 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -111,6 +111,13 @@ struct intf_sys_t
IBOutlet id o_msgs_panel; /* messages panel */
IBOutlet id o_msgs_btn_ok; /* messages btn */
IBOutlet id o_error; /* error panel */
IBOutlet id o_err_msg; /* NSTextView */
IBOutlet id o_err_lbl;
IBOutlet id o_err_bug_lbl;
IBOutlet id o_err_btn_msgs; /* Open Messages */
IBOutlet id o_err_btn_dismiss;
/* main menu */
IBOutlet id o_mi_about;
......@@ -196,6 +203,8 @@ struct intf_sys_t
- (IBAction)timesliderUpdate:(id)sender;
- (void)displayTime;
- (IBAction)closeError:(id)sender;
@end
@interface VLCMain (Internal)
......
......@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: intf.m,v 1.19 2003/01/05 16:23:57 massiot Exp $
* $Id: intf.m,v 1.20 2003/01/06 22:07:47 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -199,12 +199,12 @@ static void Run( intf_thread_t *p_intf )
[o_msgs_btn_ok setTitle: _NS("Close")];
/* main menu */
[o_mi_about setTitle: _NS("About vlc")];
[o_mi_about setTitle: _NS("About VLC Media Player")];
[o_mi_prefs setTitle: _NS("Preferences")];
[o_mi_hide setTitle: _NS("Hide vlc")];
[o_mi_hide setTitle: _NS("Hide VLC")];
[o_mi_hide_others setTitle: _NS("Hide Others")];
[o_mi_show_all setTitle: _NS("Show All")];
[o_mi_quit setTitle: _NS("Quit vlc")];
[o_mi_quit setTitle: _NS("Quit VLC")];
[o_mu_file setTitle: _NS("File")];
[o_mi_open_generic setTitle: _NS("Open...")];
......@@ -258,6 +258,13 @@ static void Run( intf_thread_t *p_intf )
[o_dmi_pause setTitle: _NS("Pause")];
[o_dmi_stop setTitle: _NS("Stop")];
/* error panel */
[o_error setTitle: _NS("Error")];
[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 :")];
[o_err_btn_msgs setTitle: _NS("Open Messages Window")];
[o_err_btn_dismiss setTitle: _NS("Dismiss")];
[self manageMode];
}
......@@ -309,7 +316,7 @@ static void Run( intf_thread_t *p_intf )
p_intf->p_sys->p_input = NULL;
}
if( p_intf->p_sys->p_input != NULL )
if( p_intf->p_sys->p_input != NULL && !p_intf->p_sys->p_input->b_die )
{
vlc_bool_t b_need_menus = 0;
input_thread_t * p_input = p_intf->p_sys->p_input;
......@@ -323,24 +330,21 @@ static void Run( intf_thread_t *p_intf )
vlc_mutex_lock( &p_input->stream.stream_lock );
if( !p_input->b_die )
{
[self displayTime];
[self displayTime];
/* New input or stream map change */
if( p_input->stream.b_changed )
{
[self manageMode];
b_need_menus = 1;
p_intf->p_sys->b_playing = 1;
}
/* New input or stream map change */
if( p_input->stream.b_changed )
{
[self manageMode];
b_need_menus = 1;
p_intf->p_sys->b_playing = 1;
}
if( p_intf->p_sys->i_part !=
p_input->stream.p_selected_area->i_part )
{
p_intf->p_sys->b_chapter_update = 1;
b_need_menus = 1;
}
if( p_intf->p_sys->i_part !=
p_input->stream.p_selected_area->i_part )
{
p_intf->p_sys->b_chapter_update = 1;
b_need_menus = 1;
}
if ( p_aout != NULL )
......@@ -442,6 +446,23 @@ static void Run( intf_thread_t *p_intf )
[o_messages insertText: o_msg_color];
[o_messages insertText: @"\n"];
if ( i_type == 1 )
{
/* Error panel */
NSString *o_my_msg =
[NSString stringWithFormat: @"%s: %s\n",
p_intf->p_sys->p_sub->p_msg[i_start].psz_module,
p_intf->p_sys->p_sub->p_msg[i_start].psz_msg];
[o_err_msg setEditable: YES];
[o_err_msg setSelectedRange:
NSMakeRange( [[o_err_msg string] length], 0 )];
[o_err_msg insertText: o_my_msg];
[o_error makeKeyAndOrderFront: self];
[o_err_msg setEditable: NO];
}
}
[o_messages setEditable: NO];
......@@ -1058,6 +1079,17 @@ static void Run( intf_thread_t *p_intf )
#undef p_area
}
- (IBAction)closeError:(id)sender
{
/* Error panel */
[o_err_msg setEditable: YES];
[o_err_msg setSelectedRange:
NSMakeRange( 0, [[o_err_msg string] length] )];
[o_err_msg insertText: @""];
[o_err_msg setEditable: NO];
[o_error performClose: self];
}
@end
@implementation VLCMain (NSMenuValidation)
......
......@@ -2,7 +2,7 @@
* open.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: open.m,v 1.7 2003/01/06 02:45:09 massiot Exp $
* $Id: open.m,v 1.8 2003/01/06 22:07:47 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -167,7 +167,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
free(psz_sout);
}
[o_panel setTitle: _NS("Open Target")];
[o_panel setTitle: _NS("Open Source")];
[o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
[o_btn_ok setTitle: _NS("OK")];
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -2,7 +2,7 @@
* mixer.c : audio output mixing operations
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: mixer.c,v 1.22 2002/12/18 14:17:11 sam Exp $
* $Id: mixer.c,v 1.23 2003/01/06 22:07:47 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -193,8 +193,8 @@ static int MixBuffer( aout_instance_t * p_aout )
while ( p_buffer != NULL && p_buffer->end_date < start_date )
{
aout_buffer_t * p_next = p_buffer->p_next;
msg_Err( p_aout, "the mixer got a packet in the past ("I64Fd")",
start_date - p_buffer->end_date );
msg_Warn( p_aout, "the mixer got a packet in the past ("I64Fd")",
start_date - p_buffer->end_date );
aout_BufferFree( p_buffer );
p_fifo->p_first = p_buffer = p_next;
p_input->p_first_byte_to_mix = NULL;
......
......@@ -2,7 +2,7 @@
* threads.c : threads implementation for the VideoLAN client
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: threads.c,v 1.30 2002/12/18 14:17:11 sam Exp $
* $Id: threads.c,v 1.31 2003/01/06 22:07:47 massiot Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -607,13 +607,15 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line,
if ( i_priority )
{
int i_error;
struct sched_param param;
memset( &param, 0, sizeof(struct sched_param) );
param.sched_priority = i_priority;
if ( pthread_setschedparam( p_this->thread_id, SCHED_RR, &param ) )
if ( (i_error = pthread_setschedparam( p_this->thread_id,
SCHED_RR, &param )) )
{
msg_Warn( p_this, "couldn't go to real-time priority (%s:%d)",
psz_file, i_line );
msg_Warn( p_this, "couldn't go to real-time priority (%s:%d): %s",
psz_file, i_line, strerror(errno) );
i_priority = 0;
}
}
......
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