Commit 44cda990 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fixed compilation against the updated msg API

parent b1aebb75
...@@ -199,7 +199,7 @@ struct intf_sys_t ...@@ -199,7 +199,7 @@ struct intf_sys_t
- (IBAction)saveDebugLog:(id)sender; - (IBAction)saveDebugLog:(id)sender;
- (IBAction)showMessagesPanel:(id)sender; - (IBAction)showMessagesPanel:(id)sender;
- (void)processReceivedlibvlcMessage:(const msg_item_t *)item; - (void)processReceivedlibvlcMessage:(const msg_item_t *) item ofType: (int)type withStr: (char *)str;
- (void)updateTogglePlaylistState; - (void)updateTogglePlaylistState;
......
...@@ -70,7 +70,7 @@ static void updateProgressPanel (void *, const char *, float); ...@@ -70,7 +70,7 @@ static void updateProgressPanel (void *, const char *, float);
static bool checkProgressPanel (void *); static bool checkProgressPanel (void *);
static void destroyProgressPanel (void *); static void destroyProgressPanel (void *);
static void MsgCallback( void *, const msg_item_t * ); static void MsgCallback( void *data, int type, const msg_item_t *item, const char *format, va_list ap );
static int InputEvent( vlc_object_t *, const char *, static int InputEvent( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * ); vlc_value_t, vlc_value_t, void * );
...@@ -219,19 +219,24 @@ static void Run( intf_thread_t *p_intf ) ...@@ -219,19 +219,24 @@ static void Run( intf_thread_t *p_intf )
* ready to be displayed. We store everything in a NSArray in our Cocoa part * ready to be displayed. We store everything in a NSArray in our Cocoa part
* of this file. * of this file.
*****************************************************************************/ *****************************************************************************/
static void MsgCallback( void *data, const msg_item_t *item ) static void MsgCallback( void *data, int type, const msg_item_t *item, const char *format, va_list ap )
{ {
int canc = vlc_savecancel(); int canc = vlc_savecancel();
char *str;
/* this may happen from time to time, let's bail out as info would be useless anyway */ /* this may happen from time to time, let's bail out as info would be useless anyway */
if( !item->psz_module || !item->psz_msg ) if( !item->psz_module || !format )
return;
if (vasprintf( &str, format, ap ) == -1)
return; return;
NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
[[VLCMain sharedInstance] processReceivedlibvlcMessage: item]; [[VLCMain sharedInstance] processReceivedlibvlcMessage: item ofType: type withStr: str];
[o_pool release]; [o_pool release];
vlc_restorecancel( canc ); vlc_restorecancel( canc );
free( str );
} }
static int InputEvent( vlc_object_t *p_this, const char *psz_var, static int InputEvent( vlc_object_t *p_this, const char *psz_var,
...@@ -1769,7 +1774,7 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -1769,7 +1774,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
} }
} }
- (void)processReceivedlibvlcMessage:(const msg_item_t *)item - (void)processReceivedlibvlcMessage:(const msg_item_t *) item ofType: (int)i_type withStr: (char *)str
{ {
NSColor *o_white = [NSColor whiteColor]; NSColor *o_white = [NSColor whiteColor];
NSColor *o_red = [NSColor redColor]; NSColor *o_red = [NSColor redColor];
...@@ -1782,8 +1787,6 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -1782,8 +1787,6 @@ unsigned int CocoaKeyToVLC( unichar i_key )
NSDictionary *o_attr; NSDictionary *o_attr;
NSAttributedString *o_msg_color; NSAttributedString *o_msg_color;
int i_type = item->i_type;
[o_msg_lock lock]; [o_msg_lock lock];
if( [o_msg_arr count] + 2 > 600 ) if( [o_msg_arr count] + 2 > 600 )
...@@ -1797,7 +1800,7 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -1797,7 +1800,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
[o_msg_arr addObject: [o_msg_color autorelease]]; [o_msg_arr addObject: [o_msg_color autorelease]];
o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type] forKey: NSForegroundColorAttributeName]; o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type] forKey: NSForegroundColorAttributeName];
o_msg_color = [[NSAttributedString alloc] initWithString: [NSString stringWithFormat: @"%s\n", item->psz_msg] attributes: o_attr]; o_msg_color = [[NSAttributedString alloc] initWithString: [NSString stringWithFormat: @"%s\n", str] attributes: o_attr];
[o_msg_arr addObject: [o_msg_color autorelease]]; [o_msg_arr addObject: [o_msg_color autorelease]];
b_msg_arr_changed = YES; b_msg_arr_changed = YES;
......
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