Commit 496d55d0 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fixed remaining 64bit issues

backport of f7692e67
parent 5f908307
...@@ -102,6 +102,7 @@ Windows CE Port: ...@@ -102,6 +102,7 @@ Windows CE Port:
EXPERIMENTAL work for the winCE port has been done. EXPERIMENTAL work for the winCE port has been done.
Mac OS X Port: Mac OS X Port:
* EXPERIMENTAL 64bit support
* Speed improvements by using llvm-gcc * Speed improvements by using llvm-gcc
* New Document icons by Dominic Spitaler * New Document icons by Dominic Spitaler
* Support for latest iSight models * Support for latest iSight models
......
...@@ -234,7 +234,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -234,7 +234,7 @@ static int Open( vlc_object_t *p_this )
if( ![p_sys->device open: &o_returnedError] ) if( ![p_sys->device open: &o_returnedError] )
{ {
msg_Err( p_demux, "Unable to open the capture device (%i)", [o_returnedError code] ); msg_Err( p_demux, "Unable to open the capture device (%ld)", [o_returnedError code] );
goto error; goto error;
} }
...@@ -304,14 +304,14 @@ static int Open( vlc_object_t *p_this ) ...@@ -304,14 +304,14 @@ static int Open( vlc_object_t *p_this )
bool ret = [p_sys->session addInput:input error: &o_returnedError]; bool ret = [p_sys->session addInput:input error: &o_returnedError];
if( !ret ) if( !ret )
{ {
msg_Err( p_demux, "default video capture device could not be added to capture session (%i)", [o_returnedError code] ); msg_Err( p_demux, "default video capture device could not be added to capture session (%ld)", [o_returnedError code] );
goto error; goto error;
} }
ret = [p_sys->session addOutput:p_sys->output error: &o_returnedError]; ret = [p_sys->session addOutput:p_sys->output error: &o_returnedError];
if( !ret ) if( !ret )
{ {
msg_Err( p_demux, "output could not be added to capture session (%i)", [o_returnedError code] ); msg_Err( p_demux, "output could not be added to capture session (%ld)", [o_returnedError code] );
goto error; goto error;
} }
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
- (id)initWithName:(NSString*)name; - (id)initWithName:(NSString*)name;
- (int)numberOfChildren; - (int)numberOfChildren;
- (VLCTreeItem *)childAtIndex:(int)i_index; - (VLCTreeItem *)childAtIndex:(NSInteger)i_index;
- (NSString *)name; - (NSString *)name;
- (NSMutableArray *)children; - (NSMutableArray *)children;
...@@ -553,7 +553,7 @@ static VLCPrefs *_o_sharedMainInstance = nil; ...@@ -553,7 +553,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
[super dealloc]; [super dealloc];
} }
- (VLCTreeItem *)childAtIndex:(int)i_index - (VLCTreeItem *)childAtIndex:(NSInteger)i_index
{ {
return [[self children] objectAtIndex:i_index]; return [[self children] objectAtIndex:i_index];
} }
......
...@@ -566,10 +566,24 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des ...@@ -566,10 +566,24 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
[self setupButton: o_osd_encoding_pop forStringList: "subsdec-encoding"]; [self setupButton: o_osd_encoding_pop forStringList: "subsdec-encoding"];
[self setupField: o_osd_lang_fld forOption: "sub-language" ]; [self setupField: o_osd_lang_fld forOption: "sub-language" ];
if( module_exists( "quartztext" ) )
{
[self setupField: o_osd_font_fld forOption: "quartztext-font"]; [self setupField: o_osd_font_fld forOption: "quartztext-font"];
[self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"]; [self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"];
[self setupButton: o_osd_font_size_pop forIntList: "quartztext-rel-fontsize"]; [self setupButton: o_osd_font_size_pop forIntList: "quartztext-rel-fontsize"];
}
else
{
[o_osd_font_fld setEnabled: NO];
[o_osd_font_color_pop setEnabled: NO];
[o_osd_font_size_pop setEnabled: NO];
[o_osd_font_color_pop removeAllItems];
[o_osd_font_size_pop removeAllItems];
[o_osd_font_btn setEnabled: NO];
}
/******************** /********************
* hotkeys settings * * hotkeys settings *
...@@ -921,10 +935,13 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -921,10 +935,13 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
config_PutPsz( p_intf, "subsdec-encoding", [[[o_osd_encoding_pop selectedItem] title] UTF8String] ); config_PutPsz( p_intf, "subsdec-encoding", [[[o_osd_encoding_pop selectedItem] title] UTF8String] );
config_PutPsz( p_intf, "sub-language", [[o_osd_lang_fld stringValue] UTF8String] ); config_PutPsz( p_intf, "sub-language", [[o_osd_lang_fld stringValue] UTF8String] );
config_PutPsz( p_intf, "quartztext-font", [[o_osd_font_fld stringValue] UTF8String] );
if( module_exists( "quartztext" ) )
{
config_PutPsz( p_intf, "quartztext-font", [[o_osd_font_fld stringValue] UTF8String] );
SaveIntList( o_osd_font_color_pop, "quartztext-color" ); SaveIntList( o_osd_font_color_pop, "quartztext-color" );
SaveIntList( o_osd_font_size_pop, "quartztext-rel-fontsize" ); SaveIntList( o_osd_font_size_pop, "quartztext-rel-fontsize" );
}
i = config_SaveConfigFile( p_intf, NULL ); i = config_SaveConfigFile( p_intf, NULL );
...@@ -1098,6 +1115,8 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -1098,6 +1115,8 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
- (IBAction)showFontPicker:(id)sender - (IBAction)showFontPicker:(id)sender
{ {
if( module_exists( "quartztext" ) )
{
char * font = config_GetPsz( p_intf, "quartztext-font" ); char * font = config_GetPsz( p_intf, "quartztext-font" );
NSString * fontFamilyName = font ? [NSString stringWithUTF8String: font] : nil; NSString * fontFamilyName = font ? [NSString stringWithUTF8String: font] : nil;
free(font); free(font);
...@@ -1109,6 +1128,11 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch ...@@ -1109,6 +1128,11 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
} }
[[NSFontManager sharedFontManager] setTarget: self]; [[NSFontManager sharedFontManager] setTarget: self];
[[NSFontPanel sharedFontPanel] orderFront:self]; [[NSFontPanel sharedFontPanel] orderFront:self];
}
else
{
[sender setEnabled: NO];
}
} }
- (void)changeFont:(id)sender - (void)changeFont:(id)sender
......
...@@ -21,6 +21,13 @@ ...@@ -21,6 +21,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifdef __x86_64__
#warning "No text renderer build! Quartztext isn't 64bit compatible!"
#warning "RE-WRITE ME!"
#else
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Preamble // Preamble
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
...@@ -887,3 +894,5 @@ static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, UniCha ...@@ -887,3 +894,5 @@ static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, UniCha
return VLC_SUCCESS; return VLC_SUCCESS;
} }
#endif
\ No newline at end of file
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