Changeset 762b3db96149080bc7a700e51f87ae112d07a526

Show
Ignore:
Timestamp:
02/11/08 00:53:48 (7 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1202687628 +0000
git-parent:

[d6ec7709332f4612c7b8050ca69c94b052d0f3a9]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1202687628 +0000
Message:

framework: Fix the configure script. Fix a bunch of warnings.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • projects/macosx/framework/Headers/Public/VLCMedia.h

    rb3372f1 r762b3db  
    190190 * \see lengthWaitUntilDate 
    191191 */ 
    192 @property (readonly) VLCTime * length; 
     192@property (retain, readonly) VLCTime * length; 
    193193 
    194194/** 
    …… 
    210210 * The URL for the receiver's media resource. 
    211211 */ 
    212 @property (readonly) NSURL * url; 
     212@property (retain, readonly) NSURL * url; 
    213213 
    214214/** 
    215215 * The receiver's sub list. 
    216216 */ 
    217 @property (readonly) VLCMediaList * subitems; 
     217@property (retain, readonly) VLCMediaList * subitems; 
    218218 
    219219/** 
    220220 * The receiver's meta data as a NSDictionary object. 
    221221 */ 
    222 @property (readonly) NSDictionary * metaDictionary; 
     222@property (retain, readonly) NSDictionary * metaDictionary; 
    223223 
    224224/** 

  • projects/macosx/framework/Sources/VLCLibrary.m

    rb3372f1 r762b3db  
    8383        const char * lib_vlc_params[] = {  
    8484            "-I", "dummy", "--vout=opengllayer",  
    85             "--no-video-title-show", "--no-sout-keep", "-vvv" 
     85            "--no-video-title-show", "--no-sout-keep" 
    8686            //, "--control=motion", "--motion-use-rotate", "--video-filter=rotate" 
    8787        }; 

  • projects/macosx/framework/Sources/VLCMedia.m

    rb3372f1 r762b3db  
    359359    for( NSString * key in [options allKeys] ) 
    360360    { 
    361         NSLog(@"Adding %@", [NSString stringWithFormat:@"--%@ %@", key, [options objectForKey:key]]); 
    362361        libvlc_media_descriptor_add_option(p_md, [[NSString stringWithFormat:@"%@=#%@", key, [options objectForKey:key]] UTF8String], NULL); 
    363362    } 
    …… 
    461460 
    462461    state = LibVLCStateToMediaState(libvlc_media_descriptor_get_state( p_md, NULL )); 
     462 
    463463    /* Force VLCMetaInformationTitle, that will trigger preparsing 
    464464     * And all the other meta will be added through the libvlc event system */ 
    465465    [self fetchMetaInformationFromLibVLCWithType: VLCMetaInformationTitle]; 
     466 
     467    /* Force VLCMetaInformationArtworkURL, that will trigger artwork fetching */ 
     468    [self fetchMetaInformationFromLibVLCWithType: VLCMetaInformationArtworkURL]; 
    466469} 
    467470 
    …… 
    473476    free(psz_value); 
    474477 
    475     if ( !(newValue && oldValue && [oldValue compare:newValue] == NSOrderedSame) ) 
     478    if ( newValue != oldValue && !(oldValue && newValue && [oldValue compare:newValue] == NSOrderedSame) ) 
    476479    { 
    477480        if ([metaType isEqualToString:VLCMetaInformationArtworkURL]) 
    …… 
    490493{ 
    491494    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; 
    492      
    493     // Go ahead and load up the art work 
    494     NSURL * artUrl = [NSURL URLWithString:[anURL stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; 
    495     NSImage * art  = [[[NSImage alloc] initWithContentsOfURL:artUrl] autorelease];  
    496          
     495    NSImage * art = nil; 
     496 
     497    if( anURL ) 
     498    { 
     499        // Go ahead and load up the art work 
     500        NSURL * artUrl = [NSURL URLWithString:[anURL stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; 
     501 
     502        // Don't attempt to fetch artwork from remote. Core will do that alone 
     503        if ([artUrl isFileURL]) 
     504            art  = [[[NSImage alloc] initWithContentsOfURL:artUrl] autorelease];  
     505    } 
     506 
    497507    // If anything was found, lets save it to the meta data dictionary 
    498     if (art) 
    499     { 
    500         [self performSelectorOnMainThread:@selector(setArtwork:) withObject:art waitUntilDone:NO]; 
    501     } 
     508    [self performSelectorOnMainThread:@selector(setArtwork:) withObject:art waitUntilDone:NO]; 
    502509 
    503510    [pool release]; 
    …… 
    506513- (void)setArtwork:(NSImage *)art 
    507514{ 
     515    if (!art) 
     516    { 
     517        [metaDictionary removeObjectForKey:@"artwork"]; 
     518        return; 
     519    } 
     520 
    508521    [metaDictionary setObject:art forKey:@"artwork"]; 
    509522} 

  • projects/macosx/framework/Sources/VLCVideoLayer.m

    rb3372f1 r762b3db  
    9595 
    9696    [CATransaction commit]; 
     97 
     98    /* Trigger by hand, as it doesn't go through else. Assumed bug from Cocoa */ 
     99    [self willChangeValueForKey:@"hasVideo"]; 
    97100    self.hasVideo = YES; 
     101    [self didChangeValueForKey:@"hasVideo"]; 
    98102} 
    99103 
    …… 
    103107    [voutLayer removeFromSuperlayer]; 
    104108    [CATransaction commit]; 
     109     
     110    /* Trigger by hand, as it doesn't go through else. Assumed bug from Cocoa */ 
     111    [self willChangeValueForKey:@"hasVideo"]; 
    105112    self.hasVideo = NO; 
     113    [self didChangeValueForKey:@"hasVideo"]; 
    106114} 
    107115 

  • projects/macosx/framework/VLCKit.xcodeproj/project.pbxproj

    r816f808 r762b3db  
    431431            runOnlyForDeploymentPostprocessing = 0; 
    432432            shellPath = /bin/sh; 
    433             shellScript = "top_srcdir=`pwd`/../../..\n\nif test $ACTION = \"clean\"\nthen\n    rm -f $SYMROOT/vlc_build_dir/CMakeLists.txt\n    exit 0\nfi\n\necho \"$SRCROOT/../../../CMakeLists.txt doesn't exists\"\ncd $top_srcdir && ./extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh\n"; 
     433            shellScript = "top_srcdir=`pwd`/../../..\n\nif test $ACTION = \"clean\"\nthen\n    rm -f $SYMROOT/vlc_build_dir/CMakeLists.txt\n    exit 0\nfi\n\ncd $top_srcdir && ./extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh\n"; 
    434434            showEnvVarsInLog = 0; 
    435435        }; 
    …… 
    476476            runOnlyForDeploymentPostprocessing = 0; 
    477477            shellPath = /bin/sh; 
    478             shellScript = "echo $ACTION\nif test $ACTION = \"clean\"\nthen\n\trm -Rf $SYMROOT/vlc_build_dir\n     exit 0\nfi\n\ntop_srcdir=`pwd`/../../..\n\nif ! test -e $SYMROOT/vlc_build_dir/CMakeCache.txt\nthen\n\tmkdir -p $SYMROOT/vlc_build_dir\n\trm -Rf $top_srcdir/CMakeCache.txt\n\tcd $SYMROOT/vlc_build_dir && $top_srcdir/extras/contrib/bin/cmake $top_srcdir -DENABLE_NO_SYMBOL_CHECK=ON\nfi"; 
     478            shellScript = "if test $ACTION = \"clean\"\nthen\n\trm -Rf $SYMROOT/vlc_build_dir\n     exit 0\nfi\n\ntop_srcdir=`pwd`/../../..\n\nif ! test -e $SYMROOT/vlc_build_dir/CMakeCache.txt\nthen\n\tmkdir -p $SYMROOT/vlc_build_dir\n\trm -Rf $top_srcdir/CMakeCache.txt\n\tcd $SYMROOT/vlc_build_dir && $top_srcdir/extras/contrib/bin/cmake $top_srcdir -DENABLE_NO_SYMBOL_CHECK=ON\nfi"; 
    479479            showEnvVarsInLog = 0; 
    480480        };