Changeset 6dda19c89830f3cc2a54706af5a97c0761d7a1b9

Show
Ignore:
Timestamp:
10/20/07 19:37:07 (11 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1192901827 +0000
git-parent:

[702edfe8aac9efe6fb3e5e89b60d4b2d08c94b4d]

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

MacOSX/Framework: Very minor identation changes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/MacOSX/Framework/Headers/Public/VLCMediaLibrary.h

    rce7c4d3 r6dda19c  
    3030@interface VLCMediaLibrary : NSObject 
    3131{ 
    32     void *mlib; 
    33     VLCMediaList *allMedia; 
     32    void * mlib; 
     33    VLCMediaList * allMedia; 
    3434} 
    3535+ (id)sharedMediaLibrary; 

  • extras/MacOSX/Framework/Headers/Public/VLCMediaList.h

    rce7c4d3 r6dda19c  
    2626 
    2727/* Notification Messages */ 
    28 extern NSString *VLCMediaListItemAdded; 
    29 extern NSString *VLCMediaListItemDeleted; 
     28extern NSString * VLCMediaListItemAdded; 
     29extern NSString * VLCMediaListItemDeleted; 
    3030 
    3131@class VLCMedia; 
    …… 
    6060- (int)count; 
    6161 
    62 #if 0 /* Disabled until this get fixed in libvlc 
     62#if 0 /* Disabled until this get fixed in libvlc */ 
    6363- (NSArray *)sublists; //< A way to see the same media list. Only sub media list. 
    6464- (NSArray *)flatMediaView; //< A way to see the same media list. Only media. 

  • extras/MacOSX/Framework/Headers/Public/VLCMediaPlayer.h

    rce7c4d3 r6dda19c  
    2727 
    2828/* Notification Messages */ 
    29 extern NSString *VLCMediaPlayerTimeChanged; 
    30 extern NSString *VLCMediaPlayerStateChanged; 
     29extern NSString * VLCMediaPlayerTimeChanged; 
     30extern NSString * VLCMediaPlayerStateChanged; 
    3131 
    3232// TODO: Documentation 

  • extras/MacOSX/Framework/Headers/Public/VLCVideoView.h

    rce7c4d3 r6dda19c  
    2626 
    2727/* Notifications */ 
    28 extern NSString *VLCVideoViewEnteredFullScreen; 
    29 extern NSString *VLCVideoViewLeftFullScreen; 
     28extern NSString * VLCVideoViewEnteredFullScreen; 
     29extern NSString * VLCVideoViewLeftFullScreen; 
    3030 
    3131@protocol VLCVideoViewDelegate 
    …… 
    5050{ 
    5151    id delegate; 
    52     NSColor *backColor; 
     52    NSColor * backColor; 
    5353    BOOL stretchesVideo; 
    5454     

  • extras/MacOSX/Framework/Sources/VLCLibrary.m

    rce7c4d3 r6dda19c  
    3838        /* XXX: localization */ 
    3939        NSRunCriticalAlertPanel( @"Error", [NSString stringWithFormat:@"libvlc has thrown us an error: %s (%s:%d %s)",  
    40             libvlc_exception_get_message(ex), file, line_number, function], @"Quit", nil, nil ); 
     40            libvlc_exception_get_message( ex ), file, line_number, function], @"Quit", nil, nil ); 
    4141        exit( ex->i_code ); 
    4242    } 
    …… 
    6262         
    6363        // Register a function to gracefully destroy the shared library on exit. 
    64         atexit((void*)DestroySharedLibraryAtExit); 
     64        atexit( (void*)DestroySharedLibraryAtExit ); 
    6565    } 
    6666    return sharedLibrary; 
    …… 
    8080         
    8181        // Figure out the frameworks path 
    82         char *applicationPath = strdup([[NSString stringWithFormat:@"%@/Versions/Current/VLC",  
    83             [[NSBundle bundleForClass:[VLCLibrary class]] bundlePath]] UTF8String]); 
     82        char *applicationPath = strdup( [[NSString stringWithFormat:@"%@/Versions/Current/VLC",  
     83            [[NSBundle bundleForClass:[VLCLibrary class]] bundlePath]] UTF8String] ); 
    8484        // TODO: Raise error if there is no memory available 
    8585         
    …… 
    9090        }; 
    9191         
    92         instance = (void *)libvlc_new(7, lib_vlc_params, &ex); 
     92        instance = (void *)libvlc_new( 7, lib_vlc_params, &ex ); 
    9393        quit_on_exception( &ex ); 
    9494         
    …… 
    100100         
    101101        // free allocated resources 
    102         free(applicationPath); 
     102        free( applicationPath ); 
    103103    } 
    104104    return self; 
    …… 
    115115        { 
    116116            libvlc_exception_t ex; 
    117             libvlc_exception_init(&ex); 
     117            libvlc_exception_init( &ex ); 
    118118             
    119             libvlc_destroy(instance, &ex); 
     119            libvlc_destroy( instance, &ex ); 
    120120        } 
    121121    } 

  • extras/MacOSX/Framework/Sources/VLCMedia.m

    rce7c4d3 r6dda19c  
    220220    [metaDictionary release]; 
    221221     
    222     libvlc_media_descriptor_release(p_md); 
     222    libvlc_media_descriptor_release( p_md ); 
    223223 
    224224    [super dealloc]; 
    …… 
    258258    { 
    259259        // Try figuring out what the length is 
    260         long long duration = libvlc_media_descriptor_get_duration(p_md, NULL); 
     260        long long duration = libvlc_media_descriptor_get_duration( p_md, NULL ); 
    261261        if (duration > -1)  
    262262        { 
    …… 
    279279        while (!length && ![self isPreparsed] && [aDate timeIntervalSinceNow] > 0) 
    280280        { 
    281             usleep(THREAD_SLEEP); 
     281            usleep( THREAD_SLEEP ); 
    282282        } 
    283283         
    …… 
    295295- (BOOL)isPreparsed 
    296296{ 
    297     return libvlc_media_descriptor_is_preparsed(p_md, NULL); 
     297    return libvlc_media_descriptor_is_preparsed( p_md, NULL ); 
    298298} 
    299299 
    …… 
    321321    libvlc_exception_init( &ex ); 
    322322     
    323     VLCMedia *media = (VLCMedia *)libvlc_media_descriptor_get_user_data(md, &ex); 
    324     if (!media || libvlc_exception_raised(&ex)) 
    325     { 
    326         libvlc_exception_clear(&ex); 
     323    VLCMedia *media = (VLCMedia *)libvlc_media_descriptor_get_user_data( md, &ex ); 
     324    if (!media || libvlc_exception_raised( &ex )) 
     325    { 
     326        libvlc_exception_clear( &ex ); 
    327327        return [[[VLCMedia alloc] initWithLibVLCMediaDescriptor:md] autorelease]; 
    328328    } 
    …… 
    345345        return [self retain]; 
    346346    } 
    347     libvlc_exception_clear(&ex);    // Just in case an exception was raised, lets release it 
     347    libvlc_exception_clear( &ex );    // Just in case an exception was raised, lets release it 
    348348     
    349349    if (self = [super init]) 
    …… 
    351351        char * p_url; 
    352352         
    353         p_url = libvlc_media_descriptor_get_mrl(md, &ex); 
     353        p_url = libvlc_media_descriptor_get_mrl( md, &ex ); 
    354354        quit_on_exception( &ex ); 
    355355         
    356356        url = [NSString stringWithCString:p_url]; 
    357357         
    358         libvlc_media_descriptor_retain(md); 
     358        libvlc_media_descriptor_retain( md ); 
    359359        p_md = md; 
    360360         
    …… 
    420420{ 
    421421    libvlc_exception_t ex; 
    422     libvlc_exception_init(&ex); 
    423      
    424     libvlc_media_descriptor_set_user_data(p_md, (void*)self, &ex); 
    425     quit_on_exception(&ex); 
     422    libvlc_exception_init( &ex ); 
     423 
     424    libvlc_media_descriptor_set_user_data( p_md, (void*)self, &ex ); 
     425    quit_on_exception( &ex ); 
    426426     
    427427    // TODO: Should these events be caught by VLCMediaList's notification hooks? 
    428     libvlc_event_manager_t *p_em = libvlc_media_descriptor_event_manager(p_md, &ex); 
     428    libvlc_event_manager_t *p_em = libvlc_media_descriptor_event_manager( p_md, &ex ); 
    429429//    libvlc_event_attach(p_em, libvlc_MediaDescriptorSubItemAdded,    HandleMediaSubItemAdded,    self, &ex); 
    430430//    libvlc_event_attach(p_em, libvlc_MediaDescriptorSubItemRemoved,  HandleMediaSubItemRemoved,  self, &ex); 
    431431//    libvlc_event_attach(p_em, libvlc_MediaDescriptorMetaChanged,     HandleMediaMetaChanged,     self, &ex); 
    432432//    libvlc_event_attach(p_em, libvlc_MediaDescriptorDurationChanged, HandleMediaDurationChanged, self, &ex); 
    433     quit_on_exception(&ex); 
    434      
    435     libvlc_media_list_t *p_mlist = libvlc_media_descriptor_subitems(p_md, NULL); 
     433    quit_on_exception( &ex ); 
     434     
     435    libvlc_media_list_t *p_mlist = libvlc_media_descriptor_subitems( p_md, NULL ); 
    436436    if (!p_mlist) 
    437437        subitems = nil; 
    …… 
    440440        [subitems release]; 
    441441        subitems = [[VLCMediaList medialistWithLibVLCMediaList:p_mlist] retain]; 
    442         libvlc_media_list_release(p_mlist); 
     442        libvlc_media_list_release( p_mlist ); 
    443443    } 
    444444    [self fetchMetaInformation]; 
    …… 
    472472        result = YES; 
    473473    } 
    474     free(value); 
     474    free( value ); 
    475475    return result; 
    476476} 
    …… 
    481481    // it, just because. 
    482482     
    483     [self setMetaValue:libvlc_media_descriptor_get_meta(p_md, libvlc_meta_Title,      NULL) forKey:[VLCMedia metaTypeToString:libvlc_meta_Title]]; 
    484     [self setMetaValue:libvlc_media_descriptor_get_meta(p_md, libvlc_meta_Artist,     NULL) forKey:[VLCMedia metaTypeToString:libvlc_meta_Artist]]; 
    485     [self setMetaValue:libvlc_media_descriptor_get_meta(p_md, libvlc_meta_ArtworkURL, NULL) forKey:[VLCMedia metaTypeToString:libvlc_meta_ArtworkURL]]; 
     483    [self setMetaValue:libvlc_media_descriptor_get_meta( p_md, libvlc_meta_Title,      NULL ) forKey:[VLCMedia metaTypeToString:libvlc_meta_Title]]; 
     484    [self setMetaValue:libvlc_media_descriptor_get_meta( p_md, libvlc_meta_Artist,     NULL ) forKey:[VLCMedia metaTypeToString:libvlc_meta_Artist]]; 
     485    [self setMetaValue:libvlc_media_descriptor_get_meta( p_md, libvlc_meta_ArtworkURL, NULL ) forKey:[VLCMedia metaTypeToString:libvlc_meta_ArtworkURL]]; 
    486486} 
    487487 

  • extras/MacOSX/Framework/Sources/VLCMediaLibrary.m

    rce7c4d3 r6dda19c  
    8585    libvlc_media_list_t *p_mlist = libvlc_media_library_media_list( mlib, NULL ); 
    8686    VLCMediaList *medialist = [VLCMediaList medialistWithLibVLCMediaList:p_mlist]; 
    87     libvlc_media_list_release(p_mlist); 
     87    libvlc_media_list_release( p_mlist ); 
    8888    NSArray *ret = [medialist sublists]; 
    8989     

  • extras/MacOSX/Framework/Sources/VLCMediaList.m

    rce7c4d3 r6dda19c  
    125125- (void)lock 
    126126{ 
    127     libvlc_media_list_lock(p_mlist); 
     127    libvlc_media_list_lock( p_mlist ); 
    128128} 
    129129 
    130130- (void)unlock 
    131131{ 
    132     libvlc_media_list_unlock(p_mlist); 
     132    libvlc_media_list_unlock( p_mlist ); 
    133133} 
    134134 
    …… 
    147147    libvlc_exception_t p_e; 
    148148    libvlc_exception_init( &p_e ); 
    149     libvlc_media_list_insert_media_descriptor(p_mlist, [media libVLCMediaDescriptor], index, &p_e); 
    150     quit_on_exception(&p_e); 
     149    libvlc_media_list_insert_media_descriptor( p_mlist, [media libVLCMediaDescriptor], index, &p_e ); 
     150    quit_on_exception( &p_e ); 
    151151} 
    152152 
    …… 
    157157    // Remove it from the libvlc's medialist 
    158158    libvlc_exception_t p_e; 
    159     libvlc_exception_init(&p_e); 
    160     libvlc_media_list_remove_index(p_mlist, index, &p_e); 
    161     quit_on_exception(&p_e); 
     159    libvlc_exception_init( &p_e ); 
     160    libvlc_media_list_remove_index( p_mlist, index, &p_e ); 
     161    quit_on_exception( &p_e ); 
    162162} 
    163163 
    …… 
    165165{ 
    166166    libvlc_exception_t p_e; 
    167     libvlc_exception_init(&p_e); 
    168     libvlc_media_descriptor_t *p_md = libvlc_media_list_item_at_index(p_mlist, index, &p_e); 
    169     quit_on_exception(&p_e); 
     167    libvlc_exception_init( &p_e ); 
     168    libvlc_media_descriptor_t *p_md = libvlc_media_list_item_at_index( p_mlist, index, &p_e ); 
     169    quit_on_exception( &p_e ); 
    170170     
    171171    // Returns local object for media descriptor, searchs for user data first.  If not found it creates a  
    …… 
    177177{ 
    178178    libvlc_exception_t p_e; 
    179     libvlc_exception_init(&p_e); 
    180     int result = libvlc_media_list_count(p_mlist, &p_e); 
    181     quit_on_exception(&p_e); 
     179    libvlc_exception_init( &p_e ); 
     180    int result = libvlc_media_list_count( p_mlist, &p_e ); 
     181    quit_on_exception( &p_e ); 
    182182 
    183183    return result; 
    …… 
    187187{ 
    188188    libvlc_exception_t p_e; 
    189     libvlc_exception_init(&p_e); 
    190     int result = libvlc_media_list_index_of_item(p_mlist, [media libVLCMediaDescriptor], &p_e); 
    191     quit_on_exception(&p_e); 
     189    libvlc_exception_init( &p_e ); 
     190    int result = libvlc_media_list_index_of_item( p_mlist, [media libVLCMediaDescriptor], &p_e ); 
     191    quit_on_exception( &p_e ); 
    192192     
    193193    return result; 
    …… 
    200200 
    201201    libvlc_exception_t p_e; 
    202     libvlc_exception_init(&p_e); 
    203     count = libvlc_media_list_count(p_mlist, &p_e); 
    204     quit_on_exception(&p_e); 
     202    libvlc_exception_init( &p_e ); 
     203    count = libvlc_media_list_count( p_mlist, &p_e ); 
     204    quit_on_exception( &p_e ); 
    205205 
    206206    for(i = 0; i < count; i++) 
    …… 
    208208        libvlc_media_descriptor_t *p_md; 
    209209        libvlc_media_list_t *p_submlist; 
    210         p_md = libvlc_media_list_item_at_index(p_mlist, i, NULL); 
    211         p_submlist = libvlc_media_descriptor_subitems(p_md, NULL); 
    212         if(p_submlist) 
     210        p_md = libvlc_media_list_item_at_index( p_mlist, i, NULL ); 
     211        p_submlist = libvlc_media_descriptor_subitems( p_md, NULL ); 
     212        if (p_submlist) 
    213213        { 
    214214            [ret addObject:[VLCMediaList medialistWithLibVLCMediaList:p_submlist]]; 
    215             libvlc_media_list_release(p_submlist); 
     215            libvlc_media_list_release( p_submlist ); 
    216216        } 
    217         libvlc_media_descriptor_release(p_md); 
     217        libvlc_media_descriptor_release( p_md ); 
    218218    } 
    219219    return [ret autorelease]; 
    …… 
    276276    libvlc_exception_init(&p_e); 
    277277 
    278     libvlc_event_manager_t *p_em = libvlc_media_list_event_manager(p_mlist, &p_e); 
    279     libvlc_event_attach(p_em, libvlc_MediaListItemAdded,   HandleMediaListItemAdded,   self, &p_e); 
    280     libvlc_event_attach(p_em, libvlc_MediaListItemDeleted, HandleMediaListItemDeleted, self, &p_e); 
     278    libvlc_event_manager_t *p_em = libvlc_media_list_event_manager( p_mlist, &p_e ); 
     279    libvlc_event_attach( p_em, libvlc_MediaListItemAdded,   HandleMediaListItemAdded,   self, &p_e ); 
     280    libvlc_event_attach( p_em, libvlc_MediaListItemDeleted, HandleMediaListItemDeleted, self, &p_e ); 
    281281    [self unlock]; 
    282282     

  • extras/MacOSX/Framework/Sources/VLCMediaPlayer.m

    rce7c4d3 r6dda19c  
    9595        // instance 
    9696        libvlc_exception_t ex; 
    97         libvlc_exception_init(&ex); 
     97        libvlc_exception_init( &ex ); 
    9898        instance = (void *)libvlc_media_instance_new([VLCLibrary sharedInstance], &ex); 
    99         quit_on_exception(&ex); 
     99        quit_on_exception( &ex ); 
    100100         
    101101        [self registerObservers]; 
    …… 
    140140    // Make sure that this instance has been associated with the drawing canvas. 
    141141    libvlc_exception_t ex; 
    142     libvlc_exception_init(&ex); 
     142    libvlc_exception_init( &ex ); 
    143143    libvlc_media_instance_set_drawable ((libvlc_media_instance_t *)instance,  
    144144                                        (libvlc_drawable_t)videoView,  
    145145                                        &ex); 
    146     quit_on_exception(&ex); 
     146    quit_on_exception( &ex ); 
    147147} 
    148148 
    …… 
    160160{ 
    161161    libvlc_exception_t ex; 
    162     libvlc_exception_init(&ex); 
    163     int result = libvlc_get_fullscreen(instance, &ex); 
    164     quit_on_exception(&ex); 
     162    libvlc_exception_init( &ex ); 
     163    int result = libvlc_get_fullscreen( instance, &ex ); 
     164    quit_on_exception( &ex ); 
    165165    return result; 
    166166} 
    …… 
    168168- (void)setVideoAspectRatio:(char *)value 
    169169{ 
    170     libvlc_video_set_aspect_ratio(instance, value, NULL); 
     170    libvlc_video_set_aspect_ratio( instance, value, NULL ); 
    171171} 
    172172 
    …… 
    174174{ 
    175175    libvlc_exception_t ex; 
    176     libvlc_exception_init(&ex); 
    177     char *result = libvlc_video_get_aspect_ratio(instance, &ex); 
    178     quit_on_exception(&ex); 
     176    libvlc_exception_init( &ex ); 
     177    char *result = libvlc_video_get_aspect_ratio( instance, &ex ); 
     178    quit_on_exception( &ex ); 
    179179    return result; 
    180180} 
    …… 
    182182- (void)setVideoSubTitles:(int)value 
    183183{ 
    184     libvlc_video_set_spu(instance, value, NULL); 
     184    libvlc_video_set_spu( instance, value, NULL ); 
    185185} 
    186186 
    …… 
    188188{ 
    189189    libvlc_exception_t ex; 
    190     libvlc_exception_init(&ex); 
    191     int result = libvlc_video_get_spu(instance, &ex); 
    192     quit_on_exception(&ex); 
     190    libvlc_exception_init( &ex ); 
     191    int result = libvlc_video_get_spu( instance, &ex ); 
     192    quit_on_exception( &ex ); 
    193193    return result; 
    194194} 
    …… 
    196196- (void)setVideoCropGeometry:(char *)value 
    197197{ 
    198     libvlc_video_set_crop_geometry(instance, value, NULL); 
     198    libvlc_video_set_crop_geometry( instance, value, NULL ); 
    199199} 
    200200 
    …… 
    202202{ 
    203203    libvlc_exception_t ex; 
    204     libvlc_exception_init(&ex); 
    205     char *result = libvlc_video_get_crop_geometry(instance, &ex); 
    206     quit_on_exception(&ex); 
     204    libvlc_exception_init( &ex ); 
     205    char *result = libvlc_video_get_crop_geometry( instance, &ex ); 
     206    quit_on_exception( &ex ); 
    207207    return result; 
    208208} 
    …… 
    210210- (void)setVideoTeleText:(int)value 
    211211{ 
    212     libvlc_video_set_teletext(instance, value, NULL); 
     212    libvlc_video_set_teletext( instance, value, NULL ); 
    213213} 
    214214 
    …… 
    216216{ 
    217217    libvlc_exception_t ex; 
    218     libvlc_exception_init(&ex); 
    219     int result = libvlc_video_get_teletext(instance, &ex); 
    220     quit_on_exception(&ex); 
     218    libvlc_exception_init( &ex ); 
     219    int result = libvlc_video_get_teletext( instance, &ex ); 
     220    quit_on_exception( &ex ); 
    221221    return result; 
    222222} 
    …… 
    224224- (void)setRate:(int)value 
    225225{ 
    226     libvlc_media_instance_set_rate(instance, value, NULL); 
     226    libvlc_media_instance_set_rate( instance, value, NULL ); 
    227227} 
    228228 
    …… 
    230230{ 
    231231    libvlc_exception_t ex; 
    232     libvlc_exception_init(&ex); 
    233     float result = libvlc_media_instance_get_rate(instance, &ex); 
    234     quit_on_exception(&ex); 
     232    libvlc_exception_init( &ex ); 
     233    float result = libvlc_media_instance_get_rate( instance, &ex ); 
     234    quit_on_exception( &ex ); 
    235235    return result; 
    236236} 
    …… 
    239239{ 
    240240    libvlc_exception_t ex; 
    241     libvlc_exception_init(&ex); 
     241    libvlc_exception_init( &ex ); 
    242242    NSSize result = NSMakeSize(libvlc_video_get_height((libvlc_media_instance_t *)instance, &ex), 
    243243                               libvlc_video_get_width((libvlc_media_instance_t *)instance, &ex)); 
    244     quit_on_exception(&ex); 
     244    quit_on_exception( &ex ); 
    245245    return result;     
    246246} 
    …… 
    249249{ 
    250250    libvlc_exception_t ex; 
    251     libvlc_exception_init(&ex); 
     251    libvlc_exception_init( &ex ); 
    252252    BOOL result = libvlc_media_instance_has_vout((libvlc_media_instance_t *)instance, &ex); 
    253     if (libvlc_exception_raised(&ex)) 
     253    if (libvlc_exception_raised( &ex )) 
    254254    { 
    255         libvlc_exception_clear(&ex); 
     255        libvlc_exception_clear( &ex ); 
    256256        return NO; 
    257257    } 
    …… 
    263263{ 
    264264    libvlc_exception_t ex; 
    265     libvlc_exception_init(&ex); 
    266     float result = libvlc_media_instance_get_fps((libvlc_media_instance_t *)instance, &ex); 
    267     quit_on_exception(&ex); 
     265    libvlc_exception_init( &ex ); 
     266    float result = libvlc_media_instance_get_fps( (libvlc_media_instance_t *)instance, &ex ); 
     267    quit_on_exception( &ex ); 
    268268    return result; 
    269269} 
    …… 
    272272{ 
    273273    libvlc_exception_t ex; 
    274     libvlc_exception_init(&ex); 
     274    libvlc_exception_init( &ex ); 
    275275    // Time is managed in seconds, while duration is managed in microseconds 
    276276    // TODO: Redo VLCTime to provide value numberAsMilliseconds, numberAsMicroseconds, numberAsSeconds, numberAsMinutes, numberAsHours 
    277     libvlc_media_instance_set_time((libvlc_media_instance_t *)instance,  
    278                                    (value ? [[value numberValue] longLongValue] / 1000 : 0), 
    279                                    &ex); 
    280     quit_on_exception(&ex); 
     277    libvlc_media_instance_set_time( (libvlc_media_instance_t *)instance,  
     278                                    (value ? [[value numberValue] longLongValue] / 1000 : 0), 
     279                                    &ex ); 
     280    quit_on_exception( &ex ); 
    281281} 
    282282 
    …… 
    284284{ 
    285285    libvlc_exception_t ex; 
    286     libvlc_exception_init(&ex); 
     286    libvlc_exception_init( &ex ); 
    287287     
    288288    // Results are returned in seconds...duration is returned in milliseconds 
    289     long long time = libvlc_media_instance_get_time((libvlc_media_instance_t *)instance, &ex) * 1000; 
    290     if (libvlc_exception_raised(&ex)) 
     289    long long time = libvlc_media_instance_get_time( (libvlc_media_instance_t *)instance, &ex ) * 1000; 
     290    if (libvlc_exception_raised( &ex )) 
    291291    { 
    292         libvlc_exception_clear(&ex); 
     292        libvlc_exception_clear( &ex ); 
    293293        return [VLCTime nullTime];        // Error in obtaining the time, return a null time defintition (--:--:--) 
    294294    } 
    …… 
    299299- (void)setAudioTrack:(int)value 
    300300{ 
    301     libvlc_audio_set_track(instance, value, NULL); 
     301    libvlc_audio_set_track( instance, value, NULL ); 
    302302} 
    303303 
    …… 
    305305{ 
    306306    libvlc_exception_t ex; 
    307     libvlc_exception_init(&ex); 
    308     int result = libvlc_audio_get_track(instance, &ex); 
    309     quit_on_exception(&ex); 
     307    libvlc_exception_init( &ex ); 
     308    int result = libvlc_audio_get_track( instance, &ex ); 
     309    quit_on_exception( &ex ); 
    310310    return result; 
    311311} 
    …… 
    313313- (void)setAudioChannel:(int)value 
    314314{ 
    315     libvlc_audio_set_channel(instance, value, NULL); 
     315    libvlc_audio_set_channel( instance, value, NULL ); 
    316316} 
    317317 
    …… 
    319319{ 
    320320    libvlc_exception_t ex; 
    321     libvlc_exception_init(&ex); 
    322     int result = libvlc_audio_get_channel(instance, &ex); 
    323     quit_on_exception(&ex); 
     321    libvlc_exception_init( &ex ); 
     322    int result = libvlc_audio_get_channel( instance, &ex ); 
     323    quit_on_exception( &ex ); 
    324324    return result; 
    325325} 
    …… 
    348348 
    349349        libvlc_exception_t ex; 
    350         libvlc_exception_init(&ex); 
    351         libvlc_media_instance_set_media_descriptor(instance, [media libVLCMediaDescriptor], &ex); 
    352         quit_on_exception(&ex); 
     350        libvlc_exception_init( &ex ); 
     351        libvlc_media_instance_set_media_descriptor( instance, [media libVLCMediaDescriptor], &ex ); 
     352        quit_on_exception( &ex ); 
    353353         
    354354        if (media) { 
    …… 
    371371     
    372372    libvlc_exception_t ex; 
    373     libvlc_exception_init(&ex); 
    374  
    375     libvlc_media_instance_play((libvlc_media_instance_t *)instance, &ex); 
    376     quit_on_exception(&ex); 
     373    libvlc_exception_init( &ex ); 
     374 
     375    libvlc_media_instance_play( (libvlc_media_instance_t *)instance, &ex ); 
     376    quit_on_exception( &ex ); 
    377377 
    378378    return YES; 
    …… 
    392392    // Pause the stream 
    393393    libvlc_exception_t ex; 
    394     libvlc_exception_init(&ex); 
    395     libvlc_media_instance_pause((libvlc_media_instance_t *)instance, &ex); 
    396     quit_on_exception(&ex); 
     394    libvlc_exception_init( &ex ); 
     395    libvlc_media_instance_pause( (libvlc_media_instance_t *)instance, &ex ); 
     396    quit_on_exception( &ex ); 
    397397     
    398398    // TODO: Should we record the time in case the media instance is destroyed 
    …… 
    410410    // compensate? 
    411411    //    libvlc_exception_t ex; 
    412     //    libvlc_exception_init(&ex); 
     412    //    libvlc_exception_init( &ex ); 
    413413    //    libvlc_media_instance_stop((libvlc_media_instance_t *)instance, &ex); 
    414     //    quit_on_exception(&ex); 
     414    //    quit_on_exception( &ex ); 
    415415     
    416416    // Pause and reposition to the begining of the stream. 
    …… 
    435435{ 
    436436    libvlc_exception_t ex; 
    437     libvlc_exception_init(&ex); 
    438     BOOL ret = libvlc_media_instance_will_play((libvlc_media_instance_t *)instance, &ex); 
     437    libvlc_exception_init( &ex ); 
     438    BOOL ret = libvlc_media_instance_will_play( (libvlc_media_instance_t *)instance, &ex ); 
    439439    if (libvlc_exception_raised(&ex)) 
    440440    { 
    …… 
    446446} 
    447447 
    448 static VLCMediaPlayerState libvlc_to_local_state [] = 
     448static VLCMediaPlayerState libvlc_to_local_state[] = 
    449449{ 
    450450    [libvlc_Stopped]    = VLCMediaPlayerStateStopped, 
    451451    [libvlc_Opening]    = VLCMediaPlayerStateOpening, 
    452     [libvlc_Buffering]    = VLCMediaPlayerStateBuffering, 
     452    [libvlc_Buffering]  = VLCMediaPlayerStateBuffering, 
    453453    [libvlc_Playing]    = VLCMediaPlayerStatePlaying, 
    454     [libvlc_Paused]        = VLCMediaPlayerStatePaused, 
    455     [libvlc_Ended]        = VLCMediaPlayerStateEnded, 
    456     [libvlc_Error]        = VLCMediaPlayerStateError 
     454    [libvlc_Paused]     = VLCMediaPlayerStatePaused, 
     455    [libvlc_Ended]      = VLCMediaPlayerStateEnded, 
     456    [libvlc_Error]      = VLCMediaPlayerStateError 
    457457}; 
    458458 
    …… 
    464464     
    465465    libvlc_exception_t ex; 
    466     libvlc_exception_init(&ex); 
    467     libvlc_state_t libvlc_state = libvlc_media_instance_get_state((libvlc_media_instance_t *)instance, &ex); 
    468     if (libvlc_exception_raised(&ex)) 
     466    libvlc_exception_init( &ex ); 
     467    libvlc_state_t libvlc_state = libvlc_media_instance_get_state( (libvlc_media_instance_t *)instance, &ex ); 
     468    if (libvlc_exception_raised( &ex )) 
    469469    { 
    470         libvlc_exception_clear(&ex); 
     470        libvlc_exception_clear( &ex ); 
    471471        return VLCMediaPlayerStateError; 
    472472    } 
    …… 
    480480{ 
    481481    libvlc_exception_t ex; 
    482     libvlc_exception_init(&ex); 
     482    libvlc_exception_init( &ex ); 
    483483 
    484484    // Attach event observers into the media instance 
    485     libvlc_event_manager_t *p_em = libvlc_media_instance_event_manager(instance, &ex); 
    486     libvlc_event_attach(p_em, libvlc_MediaInstancePlayed,          HandleMediaInstanceStateChanged, self, &ex); 
    487     libvlc_event_attach(p_em, libvlc_MediaInstancePaused,          HandleMediaInstanceStateChanged, self, &ex); 
    488     libvlc_event_attach(p_em, libvlc_MediaInstanceReachedEnd,      HandleMediaInstanceStateChanged, self, &ex); 
    489     libvlc_event_attach(p_em, libvlc_MediaInstancePositionChanged, HandleMediaTimeChanged,            self, &ex); 
    490     quit_on_exception(&ex); 
     485    libvlc_event_manager_t *p_em = libvlc_media_instance_event_manager( instance, &ex ); 
     486    libvlc_event_attach( p_em, libvlc_MediaInstancePlayed,          HandleMediaInstanceStateChanged, self, &ex ); 
     487    libvlc_event_attach( p_em, libvlc_MediaInstancePaused,          HandleMediaInstanceStateChanged, self, &ex ); 
     488    libvlc_event_attach( p_em, libvlc_MediaInstanceReachedEnd,      HandleMediaInstanceStateChanged, self, &ex ); 
     489    libvlc_event_attach( p_em, libvlc_MediaInstancePositionChanged, HandleMediaTimeChanged,            self, &ex ); 
     490    quit_on_exception( &ex ); 
    491491} 
    492492 
    493493- (void)unregisterObservers 
    494494{ 
    495     libvlc_event_manager_t *p_em = libvlc_media_instance_event_manager(instance, NULL); 
    496     libvlc_event_detach(p_em, libvlc_MediaInstancePlayed,          HandleMediaInstanceStateChanged, self, NULL); 
    497     libvlc_event_detach(p_em, libvlc_MediaInstancePaused,          HandleMediaInstanceStateChanged, self, NULL); 
    498     libvlc_event_detach(p_em, libvlc_MediaInstanceReachedEnd,      HandleMediaInstanceStateChanged, self, NULL); 
    499     libvlc_event_detach(p_em, libvlc_MediaInstancePositionChanged, HandleMediaTimeChanged,            self, NULL); 
     495    libvlc_event_manager_t *p_em = libvlc_media_instance_event_manager( instance, NULL ); 
     496    libvlc_event_detach( p_em, libvlc_MediaInstancePlayed,          HandleMediaInstanceStateChanged, self, NULL ); 
     497    libvlc_event_detach( p_em, libvlc_MediaInstancePaused,          HandleMediaInstanceStateChanged, self, NULL ); 
     498    libvlc_event_detach( p_em, libvlc_MediaInstanceReachedEnd,      HandleMediaInstanceStateChanged, self, NULL ); 
     499    libvlc_event_detach( p_em, libvlc_MediaInstancePositionChanged, HandleMediaTimeChanged,            self, NULL ); 
    500500} 
    501501@end