[vlc-devel] commit: macosx/framework: Don' t attempt to do anything at exit or at construction this is nasty for a Framework . (Pierre d'Herbemont )
git version control
git at videolan.org
Thu Dec 10 23:02:48 CET 2009
vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Thu Dec 10 21:20:59 2009 +0100| [18b554b596ee0b298eac4e51aeb806b1492d690f] | committer: Pierre d'Herbemont
macosx/framework: Don't attempt to do anything at exit or at construction this is nasty for a Framework.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=18b554b596ee0b298eac4e51aeb806b1492d690f
---
.../macosx/framework/Headers/Public/VLCLibrary.h | 4 ---
projects/macosx/framework/Sources/VLCLibrary.m | 23 --------------------
2 files changed, 0 insertions(+), 27 deletions(-)
diff --git a/projects/macosx/framework/Headers/Public/VLCLibrary.h b/projects/macosx/framework/Headers/Public/VLCLibrary.h
index b43d74c..620f6ae 100644
--- a/projects/macosx/framework/Headers/Public/VLCLibrary.h
+++ b/projects/macosx/framework/Headers/Public/VLCLibrary.h
@@ -27,10 +27,6 @@
#import "VLCMediaList.h"
#import "VLCMedia.h"
-// FIXME: Hide from public header
-extern void * CreateSharedLibraryOnStartup( void ) __attribute__((constructor));
-extern void * DestroySharedLibraryAtExit( void ) __attribute__((destructor));
-
@class VLCAudio;
/**
diff --git a/projects/macosx/framework/Sources/VLCLibrary.m b/projects/macosx/framework/Sources/VLCLibrary.m
index 3bdb76d..cfa580b 100644
--- a/projects/macosx/framework/Sources/VLCLibrary.m
+++ b/projects/macosx/framework/Sources/VLCLibrary.m
@@ -49,29 +49,6 @@ void __catch_exception( void * e, const char * function, const char * file, int
}
}
-void * CreateSharedLibraryOnStartup( void )
-{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
- /* This library is not loaded for no reason, so let's create
- * a VLCLibrary instance. */
- [VLCLibrary sharedLibrary];
-
- [pool release];
-
- return NULL;
-}
-
-void * DestroySharedLibraryAtExit( void )
-{
- /* Release the global object that may have been alloc-ed
- * in -[VLCLibrary init] */
- [sharedLibrary release];
- sharedLibrary = nil;
-
- return NULL;
-}
-
@implementation VLCLibrary
+ (VLCLibrary *)sharedLibrary
{
More information about the vlc-devel
mailing list