[vlc-devel] commit: macosx: fixed remaining 64bit issues ( Felix Paul Kühne )
git version control
git at videolan.org
Sat Jun 13 14:18:12 CEST 2009
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Jun 13 14:13:58 2009 +0200| [f7692e679266f569519ebbfe499c8503e1620695] | committer: Felix Paul Kühne
macosx: fixed remaining 64bit issues
The Quartztext module needs a rewrite. All other parts of VLC are working nicely in 64bit mode.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f7692e679266f569519ebbfe499c8503e1620695
---
extras/contrib/src/Makefile | 4 ++
modules/access/qtcapture.m | 6 ++--
modules/gui/macosx/embeddedwindow.m | 6 ++--
modules/gui/macosx/prefs.m | 4 +-
modules/gui/macosx/sidebarview.m | 6 ++--
modules/gui/macosx/simple_prefs.m | 60 ++++++++++++++++++++++++----------
modules/misc/quartztext.c | 9 +++++
7 files changed, 66 insertions(+), 29 deletions(-)
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index a1d820e..c851459 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -156,11 +156,15 @@ endif
ifdef HAVE_DARWIN_OS_ON_INTEL
FFMPEG_CFLAGS += -DHAVE_LRINTF
endif
+ifndef HAVE_DARWIN_10
NONLLVMCC+= CC="/Developer/usr/bin/gcc-4.2"
NONLLVMCC+= CXX="/Developer/usr/bin/g++-4.2"
else
NONLLVMCC+= $(HOSTCC)
endif
+else
+NONLLVMCC+= $(HOSTCC)
+endif
ifdef HAVE_AMR
FFMPEGCONF+= --enable-libamr-nb --enable-libamr-wb --enable-nonfree
diff --git a/modules/access/qtcapture.m b/modules/access/qtcapture.m
index 01bb691..19b470b 100644
--- a/modules/access/qtcapture.m
+++ b/modules/access/qtcapture.m
@@ -233,7 +233,7 @@ static int Open( vlc_object_t *p_this )
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;
}
@@ -303,14 +303,14 @@ static int Open( vlc_object_t *p_this )
bool ret = [p_sys->session addInput:input error: &o_returnedError];
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;
}
ret = [p_sys->session addOutput:p_sys->output error: &o_returnedError];
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;
}
diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m
index c530669..527a7cc 100644
--- a/modules/gui/macosx/embeddedwindow.m
+++ b/modules/gui/macosx/embeddedwindow.m
@@ -271,7 +271,7 @@
[super resignMainWindow];
}
-- (float)splitView:(NSSplitView *) splitView constrainSplitPosition:(float) proposedPosition ofSubviewAt:(int) index
+- (CGFloat)splitView:(NSSplitView *) splitView constrainSplitPosition:(CGFloat) proposedPosition ofSubviewAt:(NSInteger) index
{
if([splitView isVertical])
return proposedPosition;
@@ -299,7 +299,7 @@
}
-- (float)splitView:(NSSplitView *) splitView constrainMinCoordinate:(float) proposedMin ofSubviewAt:(int) offset
+- (CGFloat)splitView:(NSSplitView *) splitView constrainMinCoordinate:(CGFloat) proposedMin ofSubviewAt:(NSInteger) offset
{
if([splitView isVertical])
return 125.;
@@ -307,7 +307,7 @@
return 0.;
}
-- (float)splitView:(NSSplitView *) splitView constrainMaxCoordinate:(float) proposedMax ofSubviewAt:(int) offset
+- (CGFloat)splitView:(NSSplitView *) splitView constrainMaxCoordinate:(CGFloat) proposedMax ofSubviewAt:(NSInteger) offset
{
if([splitView isVertical])
return MIN([self frame].size.width - 551, 300);
diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index e69dfda..7561b6f 100644
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -71,7 +71,7 @@
- (id)initWithName:(NSString*)name;
- (int)numberOfChildren;
-- (VLCTreeItem *)childAtIndex:(int)i_index;
+- (VLCTreeItem *)childAtIndex:(NSInteger)i_index;
- (NSString *)name;
- (NSMutableArray *)children;
@@ -556,7 +556,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
[super dealloc];
}
-- (VLCTreeItem *)childAtIndex:(int)i_index
+- (VLCTreeItem *)childAtIndex:(NSInteger)i_index
{
return [[self children] objectAtIndex:i_index];
}
diff --git a/modules/gui/macosx/sidebarview.m b/modules/gui/macosx/sidebarview.m
index 7398cc5..728af9a 100644
--- a/modules/gui/macosx/sidebarview.m
+++ b/modules/gui/macosx/sidebarview.m
@@ -39,7 +39,7 @@
return self;
}
-- (float) dividerThickness
+- (CGFloat) dividerThickness
{
return 1.0;
}
@@ -172,13 +172,13 @@
@implementation VLCSidebar (NSOutlineViewDataSource)
/* return the number of children for Obj-C pointer item */ /* DONE */
-- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
+- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
{
return [o_playlist outlineView:outlineView numberOfChildrenOfItem:item];
}
/* return the child at index for the Obj-C pointer item */ /* DONE */
-- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
+- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item
{
return [o_playlist outlineView:outlineView child:index ofItem:item];
}
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index da430b3..2d61c26 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -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 setupField: o_osd_lang_fld forOption: "sub-language" ];
- [self setupField: o_osd_font_fld forOption: "quartztext-font"];
+
+ if( module_exists( "quartztext" ) )
+ {
+ [self setupField: o_osd_font_fld forOption: "quartztext-font"];
+
+ [self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"];
+ [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];
+ }
- [self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"];
- [self setupButton: o_osd_font_size_pop forIntList: "quartztext-rel-fontsize"];
/********************
* hotkeys settings *
@@ -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, "sub-language", [[o_osd_lang_fld stringValue] UTF8String] );
- config_PutPsz( p_intf, "quartztext-font", [[o_osd_font_fld stringValue] UTF8String] );
-
- SaveIntList( o_osd_font_color_pop, "quartztext-color" );
- SaveIntList( o_osd_font_size_pop, "quartztext-rel-fontsize" );
+
+ 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_size_pop, "quartztext-rel-fontsize" );
+ }
i = config_SaveConfigFile( p_intf, NULL );
@@ -1098,17 +1115,24 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
- (IBAction)showFontPicker:(id)sender
{
- char * font = config_GetPsz( p_intf, "quartztext-font" );
- NSString * fontFamilyName = font ? [NSString stringWithUTF8String: font] : nil;
- free(font);
- if( fontFamilyName )
- {
- NSFontDescriptor * fd = [NSFontDescriptor fontDescriptorWithFontAttributes:nil];
- NSFont * font = [NSFont fontWithDescriptor:[fd fontDescriptorWithFamily:fontFamilyName] textTransform:nil];
- [[NSFontManager sharedFontManager] setSelectedFont:font isMultiple:NO];
- }
- [[NSFontManager sharedFontManager] setTarget: self];
- [[NSFontPanel sharedFontPanel] orderFront:self];
+ if( module_exists( "quartztext" ) )
+ {
+ char * font = config_GetPsz( p_intf, "quartztext-font" );
+ NSString * fontFamilyName = font ? [NSString stringWithUTF8String: font] : nil;
+ free(font);
+ if( fontFamilyName )
+ {
+ NSFontDescriptor * fd = [NSFontDescriptor fontDescriptorWithFontAttributes:nil];
+ NSFont * font = [NSFont fontWithDescriptor:[fd fontDescriptorWithFamily:fontFamilyName] textTransform:nil];
+ [[NSFontManager sharedFontManager] setSelectedFont:font isMultiple:NO];
+ }
+ [[NSFontManager sharedFontManager] setTarget: self];
+ [[NSFontPanel sharedFontPanel] orderFront:self];
+ }
+ else
+ {
+ [sender setEnabled: NO];
+ }
}
- (void)changeFont:(id)sender
diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c
index 3ac67b5..a3fc2c1 100644
--- a/modules/misc/quartztext.c
+++ b/modules/misc/quartztext.c
@@ -25,6 +25,13 @@
// Preamble
//////////////////////////////////////////////////////////////////////////////
+#ifdef __x86_64__
+
+#warning "No text renderer build! Quartztext isn't 64bit compatible!"
+#warning "RE-WRITE ME!"
+
+#else
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@ -887,3 +894,5 @@ static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, UniCha
return VLC_SUCCESS;
}
+
+#endif
More information about the vlc-devel
mailing list