Changeset 313a874300b66d715555ef968029214028cfbdb7

Show
Ignore:
Timestamp:
03/31/08 12:18:44 (4 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1206958724 +0200
git-parent:

[ee1330c497b5c78f5fcfd0145391f219e489e13a]

git-author:
Tanguy Krotoff <tkrotoff@gmail.com> 1206938108 +0200
Message:

libvlc: rename all libvlc_MediaInstance in libvlc_MediaPlayer and libvlc_MediaDescriptor to libvlc_Media

Signed-off-by: Pierre d'Herbemont <pdherbemont@videolan.org>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bindings/java/core/src/main/java/org/videolan/jvlc/MediaInstance.java

    rbf1292e r313a874  
    157157        libvlc_exception_t exception = new libvlc_exception_t(); 
    158158        for (LibVlcEventType event : EnumSet.range( 
    159             LibVlcEventType.libvlc_MediaInstancePlayed, 
    160             LibVlcEventType.libvlc_MediaInstanceTimeChanged)) 
     159            LibVlcEventType.libvlc_MediaPlayerPlayed, 
     160            LibVlcEventType.libvlc_MediaPlayerTimeChanged)) 
    161161        { 
    162162            libvlc.libvlc_event_attach(eventManager, event.ordinal(), callback, null, exception); 
    …… 
    175175        { 
    176176            for (LibVlcEventType event : EnumSet.range( 
    177                 LibVlcEventType.libvlc_MediaInstancePlayed, 
    178                 LibVlcEventType.libvlc_MediaInstancePositionChanged)) 
     177                LibVlcEventType.libvlc_MediaPlayerPlayed, 
     178                LibVlcEventType.libvlc_MediaPlayerPositionChanged)) 
    179179            { 
    180180                libvlc.libvlc_event_detach(eventManager, event.ordinal(), callback, null, exception); 

  • bindings/java/core/src/main/java/org/videolan/jvlc/event/MediaInstanceCallback.java

    ree1330c r313a874  
    5353    public void callback(libvlc_event_t libvlc_event, Pointer userData) 
    5454    { 
    55         if (libvlc_event.type == LibVlcEventType.libvlc_MediaInstancePlayed.ordinal()) 
     55        if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerPlayed.ordinal()) 
    5656        { 
    5757            listener.played(mediaInstance); 
    5858        } 
    59         else if (libvlc_event.type == LibVlcEventType.libvlc_MediaInstancePaused.ordinal()) 
     59        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerPaused.ordinal()) 
    6060        { 
    6161            listener.paused(mediaInstance); 
    6262        } 
    63         else if (libvlc_event.type == LibVlcEventType.libvlc_MediaInstanceEndReached.ordinal()) 
     63        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerEndReached.ordinal()) 
    6464        { 
    6565            listener.endReached(mediaInstance); 
    6666        } 
    67         else if (libvlc_event.type == LibVlcEventType.libvlc_MediaInstancePositionChanged.ordinal()) 
     67        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerPositionChanged.ordinal()) 
    6868        { 
    6969            listener.positionChanged(mediaInstance); 
    7070        } 
    71         else if (libvlc_event.type == LibVlcEventType.libvlc_MediaInstanceTimeChanged.ordinal()) 
     71        else if (libvlc_event.type == LibVlcEventType.libvlc_MediaPlayerTimeChanged.ordinal()) 
    7272        { 
    7373            libvlc_event.event_type_specific.setType(LibVlc.media_player_time_changed.class); 

  • bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcEventType.java

    ree1330c r313a874  
    2929public enum LibVlcEventType { 
    3030 
    31     libvlc_MediaDescriptorMetaChanged, 
    32     libvlc_MediaDescriptorSubItemAdded, 
    33     libvlc_MediaDescriptorDurationChanged, 
    34     libvlc_MediaDescriptorPreparsedChanged, 
    35     libvlc_MediaDescriptorFreed, 
    36     libvlc_MediaDescriptorStateChanged, 
    37     libvlc_MediaInstancePlayed, 
    38     libvlc_MediaInstancePaused, 
    39     libvlc_MediaInstanceEndReached, 
    40     libvlc_MediaInstanceStopped, 
    41     libvlc_MediaInstanceEncounteredError, 
    42     libvlc_MediaInstanceTimeChanged, 
    43     libvlc_MediaInstancePositionChanged; 
     31    libvlc_MediaMetaChanged, 
     32    libvlc_MediaSubItemAdded, 
     33    libvlc_MediaDurationChanged, 
     34    libvlc_MediaPreparsedChanged, 
     35    libvlc_MediaFreed, 
     36    libvlc_MediaStateChanged, 
     37    libvlc_MediaPlayerPlayed, 
     38    libvlc_MediaPlayerPaused, 
     39    libvlc_MediaPlayerEndReached, 
     40    libvlc_MediaPlayerStopped, 
     41    libvlc_MediaPlayerEncounteredError, 
     42    libvlc_MediaPlayerTimeChanged, 
     43    libvlc_MediaPlayerPositionChanged; 
    4444} 

  • bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java

    ree1330c r313a874  
    9292        libVlc.libvlc_event_attach( 
    9393            mediaInstanceEventManager, 
    94             LibVlcEventType.libvlc_MediaInstancePlayed.ordinal(), 
     94            LibVlcEventType.libvlc_MediaPlayerPlayed.ordinal(), 
    9595            played, 
    9696            null, 
    …… 
    9999        libVlc.libvlc_event_attach( 
    100100            mediaInstanceEventManager, 
    101             LibVlcEventType.libvlc_MediaInstanceEndReached.ordinal(), 
     101            LibVlcEventType.libvlc_MediaPlayerEndReached.ordinal(), 
    102102            endReached, 
    103103            null, 

  • include/vlc/libvlc_events.h

    ree1330c r313a874  
    4141 
    4242typedef enum libvlc_event_type_t { 
    43     libvlc_MediaDescriptorMetaChanged, 
    44     libvlc_MediaDescriptorSubItemAdded, 
    45     libvlc_MediaDescriptorDurationChanged, 
    46     libvlc_MediaDescriptorPreparsedChanged, 
    47     libvlc_MediaDescriptorFreed, 
    48     libvlc_MediaDescriptorStateChanged, 
    49  
    50     libvlc_MediaInstancePlayed, 
    51     libvlc_MediaInstancePaused, 
    52     libvlc_MediaInstanceEndReached, 
    53     libvlc_MediaInstanceStopped, 
    54     libvlc_MediaInstanceEncounteredError, 
    55     libvlc_MediaInstanceTimeChanged, 
    56     libvlc_MediaInstancePositionChanged, 
    57     libvlc_MediaInstanceSeekableChanged, 
    58     libvlc_MediaInstancePausableChanged, 
     43    libvlc_MediaMetaChanged, 
     44    libvlc_MediaSubItemAdded, 
     45    libvlc_MediaDurationChanged, 
     46    libvlc_MediaPreparsedChanged, 
     47    libvlc_MediaFreed, 
     48    libvlc_MediaStateChanged, 
     49 
     50    libvlc_MediaPlayerPlayed, 
     51    libvlc_MediaPlayerPaused, 
     52    libvlc_MediaPlayerEndReached, 
     53    libvlc_MediaPlayerStopped, 
     54    libvlc_MediaPlayerEncounteredError, 
     55    libvlc_MediaPlayerTimeChanged, 
     56    libvlc_MediaPlayerPositionChanged, 
     57    libvlc_MediaPlayerSeekableChanged, 
     58    libvlc_MediaPlayerPausableChanged, 
    5959 
    6060    libvlc_MediaListItemAdded, 

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

    rbf1292e r313a874  
    232232             * Before libvlc_event_detach. So this can't happen in dealloc */ 
    233233            libvlc_event_manager_t * p_em = libvlc_media_event_manager(p_md, NULL); 
    234             libvlc_event_detach(p_em, libvlc_MediaDescriptorMetaChanged,     HandleMediaMetaChanged,     self, NULL); 
    235 //            libvlc_event_detach(p_em, libvlc_MediaDescriptorDurationChanged, HandleMediaDurationChanged, self, NULL); 
    236             libvlc_event_detach(p_em, libvlc_MediaDescriptorStateChanged,    HandleMediaStateChanged,    self, NULL); 
    237             libvlc_event_detach(p_em, libvlc_MediaDescriptorSubItemAdded,    HandleMediaSubItemAdded,    self, NULL); 
     234            libvlc_event_detach(p_em, libvlc_MediaMetaChanged,     HandleMediaMetaChanged,     self, NULL); 
     235//            libvlc_event_detach(p_em, libvlc_MediaDurationChanged, HandleMediaDurationChanged, self, NULL); 
     236            libvlc_event_detach(p_em, libvlc_MediaStateChanged,    HandleMediaStateChanged,    self, NULL); 
     237            libvlc_event_detach(p_em, libvlc_MediaSubItemAdded,    HandleMediaSubItemAdded,    self, NULL); 
    238238        } 
    239239        [super release]; 
    …… 
    445445 
    446446    libvlc_event_manager_t * p_em = libvlc_media_event_manager( p_md, &ex ); 
    447     libvlc_event_attach(p_em, libvlc_MediaDescriptorMetaChanged,     HandleMediaMetaChanged,     self, &ex); 
    448 //    libvlc_event_attach(p_em, libvlc_MediaDescriptorDurationChanged, HandleMediaDurationChanged, self, &ex); 
    449     libvlc_event_attach(p_em, libvlc_MediaDescriptorStateChanged,    HandleMediaStateChanged,    self, &ex); 
    450     libvlc_event_attach(p_em, libvlc_MediaDescriptorSubItemAdded,    HandleMediaSubItemAdded,    self, &ex); 
     447    libvlc_event_attach(p_em, libvlc_MediaMetaChanged,     HandleMediaMetaChanged,     self, &ex); 
     448//    libvlc_event_attach(p_em, libvlc_MediaDurationChanged, HandleMediaDurationChanged, self, &ex); 
     449    libvlc_event_attach(p_em, libvlc_MediaStateChanged,    HandleMediaStateChanged,    self, &ex); 
     450    libvlc_event_attach(p_em, libvlc_MediaSubItemAdded,    HandleMediaSubItemAdded,    self, &ex); 
    451451    catch_exception( &ex ); 
    452452     

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

    ree1330c r313a874  
    8989    VLCMediaPlayerState newState; 
    9090 
    91     if( event->type == libvlc_MediaInstancePlayed ) 
     91    if( event->type == libvlc_MediaPlayerPlayed ) 
    9292        newState = VLCMediaPlayerStatePlaying; 
    93     else if( event->type == libvlc_MediaInstancePaused ) 
     93    else if( event->type == libvlc_MediaPlayerPaused ) 
    9494        newState = VLCMediaPlayerStatePaused; 
    95     else if( event->type == libvlc_MediaInstanceEndReached ) 
     95    else if( event->type == libvlc_MediaPlayerEndReached ) 
    9696        newState = VLCMediaPlayerStateStopped; 
    97     else if( event->type == libvlc_MediaInstanceEncounteredError ) 
     97    else if( event->type == libvlc_MediaPlayerEncounteredError ) 
    9898        newState = VLCMediaPlayerStateError; 
    9999    else 
    …… 
    641641    // Attach event observers into the media instance 
    642642    libvlc_event_manager_t * p_em = libvlc_media_player_event_manager( instance, &ex ); 
    643     libvlc_event_attach( p_em, libvlc_MediaInstancePlayed,          HandleMediaInstanceStateChanged, self, &ex ); 
    644     libvlc_event_attach( p_em, libvlc_MediaInstancePaused,          HandleMediaInstanceStateChanged, self, &ex ); 
    645     libvlc_event_attach( p_em, libvlc_MediaInstanceEndReached,      HandleMediaInstanceStateChanged, self, &ex ); 
     643    libvlc_event_attach( p_em, libvlc_MediaPlayerPlayed,          HandleMediaInstanceStateChanged, self, &ex ); 
     644    libvlc_event_attach( p_em, libvlc_MediaPlayerPaused,          HandleMediaInstanceStateChanged, self, &ex ); 
     645    libvlc_event_attach( p_em, libvlc_MediaPlayerEndReached,      HandleMediaInstanceStateChanged, self, &ex ); 
    646646    /* FIXME: We may want to turn that off when none is interested by that */ 
    647     libvlc_event_attach( p_em, libvlc_MediaInstancePositionChanged, HandleMediaPositionChanged,      self, &ex ); 
    648     libvlc_event_attach( p_em, libvlc_MediaInstanceTimeChanged,     HandleMediaTimeChanged,          self, &ex ); 
     647    libvlc_event_attach( p_em, libvlc_MediaPlayerPositionChanged, HandleMediaPositionChanged,      self, &ex ); 
     648    libvlc_event_attach( p_em, libvlc_MediaPlayerTimeChanged,     HandleMediaTimeChanged,          self, &ex ); 
    649649    catch_exception( &ex ); 
    650650} 
    …… 
    653653{ 
    654654    libvlc_event_manager_t * p_em = libvlc_media_player_event_manager( instance, NULL ); 
    655     libvlc_event_detach( p_em, libvlc_MediaInstancePlayed,          HandleMediaInstanceStateChanged, self, NULL ); 
    656     libvlc_event_detach( p_em, libvlc_MediaInstancePaused,          HandleMediaInstanceStateChanged, self, NULL ); 
    657     libvlc_event_detach( p_em, libvlc_MediaInstanceEndReached,      HandleMediaInstanceStateChanged, self, NULL ); 
    658     libvlc_event_detach( p_em, libvlc_MediaInstancePositionChanged, HandleMediaPositionChanged,      self, NULL ); 
    659     libvlc_event_detach( p_em, libvlc_MediaInstanceTimeChanged,     HandleMediaTimeChanged,          self, NULL ); 
     655    libvlc_event_detach( p_em, libvlc_MediaPlayerPlayed,          HandleMediaInstanceStateChanged, self, NULL ); 
     656    libvlc_event_detach( p_em, libvlc_MediaPlayerPaused,          HandleMediaInstanceStateChanged, self, NULL ); 
     657    libvlc_event_detach( p_em, libvlc_MediaPlayerEndReached,      HandleMediaInstanceStateChanged, self, NULL ); 
     658    libvlc_event_detach( p_em, libvlc_MediaPlayerPositionChanged, HandleMediaPositionChanged,      self, NULL ); 
     659    libvlc_event_detach( p_em, libvlc_MediaPlayerTimeChanged,     HandleMediaTimeChanged,          self, NULL ); 
    660660} 
    661661 

  • projects/mozilla/vlcshell.cpp

    rbf1292e r313a874  
    550550            libvlc_exception_init( &ex ); 
    551551            libvlc_event_attach( libvlc_media_player_event_manager( p_md, &ex ), 
    552                                  libvlc_MediaInstancePositionChanged, Redraw, NULL, &ex ); 
     552                                 libvlc_MediaPlayerPositionChanged, Redraw, NULL, &ex ); 
    553553*/ 
    554554 

  • src/control/event.c

    ree1330c r313a874  
    255255{ 
    256256#define EVENT(a) [a]=#a 
    257     EVENT(libvlc_MediaDescriptorMetaChanged), 
    258     EVENT(libvlc_MediaDescriptorSubItemAdded), 
    259     EVENT(libvlc_MediaDescriptorDurationChanged), 
    260     EVENT(libvlc_MediaDescriptorPreparsedChanged), 
    261     EVENT(libvlc_MediaDescriptorFreed), 
    262     EVENT(libvlc_MediaDescriptorStateChanged), 
    263  
    264     EVENT(libvlc_MediaInstancePlayed), 
    265     EVENT(libvlc_MediaInstancePaused), 
    266     EVENT(libvlc_MediaInstanceEndReached), 
    267     EVENT(libvlc_MediaInstanceStopped), 
    268     EVENT(libvlc_MediaInstanceTimeChanged), 
    269     EVENT(libvlc_MediaInstancePositionChanged), 
     257    EVENT(libvlc_MediaMetaChanged), 
     258    EVENT(libvlc_MediaSubItemAdded), 
     259    EVENT(libvlc_MediaDurationChanged), 
     260    EVENT(libvlc_MediaPreparsedChanged), 
     261    EVENT(libvlc_MediaFreed), 
     262    EVENT(libvlc_MediaStateChanged), 
     263 
     264    EVENT(libvlc_MediaPlayerPlayed), 
     265    EVENT(libvlc_MediaPlayerPaused), 
     266    EVENT(libvlc_MediaPlayerEndReached), 
     267    EVENT(libvlc_MediaPlayerStopped), 
     268    EVENT(libvlc_MediaPlayerTimeChanged), 
     269    EVENT(libvlc_MediaPlayerPositionChanged), 
    270270 
    271271    EVENT(libvlc_MediaListItemAdded), 

  • src/control/hierarchical_node_media_list_view.c

    rbf1292e r313a874  
    204204    if( index >= 0) 
    205205        libvlc_media_list_view_item_added( p_mlv, p_md, index ); 
    206     libvlc_event_attach( p_md->p_event_manager, libvlc_MediaDescriptorSubItemAdded, 
     206    libvlc_event_attach( p_md->p_event_manager, libvlc_MediaSubItemAdded, 
    207207                         items_subitems_added, p_mlv, NULL ); 
    208208                          
    …… 
    231231    if( index >= 0) 
    232232        libvlc_media_list_view_item_deleted( p_mlv, p_md, index ); 
    233     libvlc_event_detach( p_md->p_event_manager, libvlc_MediaDescriptorSubItemAdded, 
     233    libvlc_event_detach( p_md->p_event_manager, libvlc_MediaSubItemAdded, 
    234234                         items_subitems_added, p_mlv, NULL ); 
    235235} 

  • src/control/media.c

    rbf1292e r313a874  
    9999 
    100100    /* Construct the event */ 
    101     event.type = libvlc_MediaDescriptorSubItemAdded; 
     101    event.type = libvlc_MediaSubItemAdded; 
    102102    event.u.media_subitem_added.new_child = p_md_child; 
    103103 
    …… 
    117117 
    118118    /* Construct the event */ 
    119     event.type = libvlc_MediaDescriptorMetaChanged; 
     119    event.type = libvlc_MediaMetaChanged; 
    120120    event.u.media_meta_changed.meta_type = 
    121121        vlc_to_libvlc_meta[p_event->u.input_item_meta_changed.meta_type]; 
    …… 
    135135 
    136136    /* Construct the event */ 
    137     event.type = libvlc_MediaDescriptorDurationChanged; 
     137    event.type = libvlc_MediaDurationChanged; 
    138138    event.u.media_duration_changed.new_duration =  
    139139        p_event->u.input_item_duration_changed.new_duration; 
    …… 
    153153 
    154154    /* Construct the event */ 
    155     event.type = libvlc_MediaDescriptorPreparsedChanged; 
     155    event.type = libvlc_MediaPreparsedChanged; 
    156156    event.u.media_preparsed_changed.new_status =  
    157157        p_event->u.input_item_preparsed_changed.new_status; 
    …… 
    255255    p_md->p_event_manager = libvlc_event_manager_new( p_md, p_instance, p_e ); 
    256256    libvlc_event_manager_register_event_type( p_md->p_event_manager, 
    257         libvlc_MediaDescriptorMetaChanged, p_e ); 
     257        libvlc_MediaMetaChanged, p_e ); 
    258258    libvlc_event_manager_register_event_type( p_md->p_event_manager, 
    259         libvlc_MediaDescriptorSubItemAdded, p_e ); 
     259        libvlc_MediaSubItemAdded, p_e ); 
    260260    libvlc_event_manager_register_event_type( p_md->p_event_manager, 
    261         libvlc_MediaDescriptorFreed, p_e ); 
     261        libvlc_MediaFreed, p_e ); 
    262262    libvlc_event_manager_register_event_type( p_md->p_event_manager, 
    263         libvlc_MediaDescriptorDurationChanged, p_e ); 
     263        libvlc_MediaDurationChanged, p_e ); 
    264264    libvlc_event_manager_register_event_type( p_md->p_event_manager, 
    265         libvlc_MediaDescriptorStateChanged, p_e ); 
     265        libvlc_MediaStateChanged, p_e ); 
    266266 
    267267    vlc_gc_incref( p_md->p_input_item ); 
    …… 
    366366    /* Construct the event */ 
    367367    libvlc_event_t event; 
    368     event.type = libvlc_MediaDescriptorFreed; 
     368    event.type = libvlc_MediaFreed; 
    369369    event.u.media_freed.md = p_md; 
    370370 
    …… 
    473473 
    474474    /* Construct the event */ 
    475     event.type = libvlc_MediaDescriptorStateChanged; 
     475    event.type = libvlc_MediaStateChanged; 
    476476    event.u.media_state_changed.new_state = state; 
    477477 

  • src/control/media_list_player.c

    ree1330c r313a874  
    171171{ 
    172172    libvlc_event_attach( libvlc_media_player_event_manager( p_mlp->p_mi, NULL ), 
    173                          libvlc_MediaInstanceEndReached, 
     173                         libvlc_MediaPlayerEndReached, 
    174174                          media_player_reached_end, p_mlp, NULL ); 
    175175} 
    …… 
    188188 
    189189    libvlc_event_detach( libvlc_media_player_event_manager( p_mlp->p_mi, NULL ), 
    190                          libvlc_MediaInstanceEndReached, 
     190                         libvlc_MediaPlayerEndReached, 
    191191                         media_player_reached_end, p_mlp, NULL ); 
    192192} 

  • src/control/media_list_view.c

    rbf1292e r313a874  
    8383        /* No mlist, wait for a subitem added event */ 
    8484        libvlc_event_attach( p_md->p_event_manager, 
    85                             libvlc_MediaDescriptorSubItemAdded, 
     85                            libvlc_MediaSubItemAdded, 
    8686                            media_list_subitem_added, p_mlv, NULL ); 
    8787    } 
    …… 
    9696    libvlc_exception_init( &ignored_exception ); 
    9797    libvlc_event_detach( p_md->p_event_manager, 
    98                          libvlc_MediaDescriptorSubItemAdded, 
     98                         libvlc_MediaSubItemAdded, 
    9999                         media_list_subitem_added, p_mlv, &ignored_exception ); 
    100100    if( libvlc_exception_raised( &ignored_exception ) ) 
    …… 
    155155         * thus, no need to wait for SubItemAdded events */ 
    156156        libvlc_event_detach( p_md->p_event_manager, 
    157                              libvlc_MediaDescriptorSubItemAdded, 
     157                             libvlc_MediaSubItemAdded, 
    158158                             media_list_subitem_added, p_mlv, NULL ); 
    159159        libvlc_media_list_lock( p_mlist ); 

  • src/control/media_player.c

    ree1330c r313a874  
    150150        case END_S: 
    151151            libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL); 
    152             event.type = libvlc_MediaInstanceEndReached; 
     152            event.type = libvlc_MediaPlayerEndReached; 
    153153            break; 
    154154        case PAUSE_S: 
    155155            libvlc_media_set_state( p_mi->p_md, libvlc_Playing, NULL); 
    156             event.type = libvlc_MediaInstancePaused; 
     156            event.type = libvlc_MediaPlayerPaused; 
    157157            break; 
    158158        case PLAYING_S: 
    159159            libvlc_media_set_state( p_mi->p_md, libvlc_Playing, NULL); 
    160             event.type = libvlc_MediaInstancePlayed; 
     160            event.type = libvlc_MediaPlayerPlayed; 
    161161            break; 
    162162        case ERROR_S: 
    163163            libvlc_media_set_state( p_mi->p_md, libvlc_Error, NULL); 
    164             event.type = libvlc_MediaInstanceEncounteredError; 
     164            event.type = libvlc_MediaPlayerEncounteredError; 
    165165            break; 
    166166        default: 
    …… 
    184184 
    185185    libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL); 
    186     event.type = libvlc_MediaInstanceSeekableChanged; 
     186    event.type = libvlc_MediaPlayerSeekableChanged; 
    187187    event.u.media_player_seekable_changed.new_seekable = newval.b_bool; 
    188188 
    …… 
    203203 
    204204    libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL); 
    205     event.type = libvlc_MediaInstancePausableChanged; 
     205    event.type = libvlc_MediaPlayerPausableChanged; 
    206206    event.u.media_player_pausable_changed.new_pausable = newval.b_bool; 
    207207 
    …… 
    236236 
    237237    libvlc_event_t event; 
    238     event.type = libvlc_MediaInstancePositionChanged; 
     238    event.type = libvlc_MediaPlayerPositionChanged; 
    239239    event.u.media_player_position_changed.new_position = val.f_float; 
    240240 
    …… 
    269269 
    270270    libvlc_event_t event; 
    271     event.type = libvlc_MediaInstanceTimeChanged; 
     271    event.type = libvlc_MediaPlayerTimeChanged; 
    272272    event.u.media_player_time_changed.new_time = val.i_time; 
    273273    libvlc_event_send( p_mi->p_event_manager, &event ); 
    …… 
    317317 
    318318    libvlc_event_manager_register_event_type( p_mi->p_event_manager, 
    319             libvlc_MediaInstanceEndReached, p_e ); 
     319            libvlc_MediaPlayerEndReached, p_e ); 
    320320    libvlc_event_manager_register_event_type( p_mi->p_event_manager, 
    321             libvlc_MediaInstanceStopped, p_e ); 
     321            libvlc_MediaPlayerStopped, p_e ); 
    322322    libvlc_event_manager_register_event_type( p_mi->p_event_manager, 
    323             libvlc_MediaInstanceEncounteredError, p_e ); 
     323            libvlc_MediaPlayerEncounteredError, p_e ); 
    324324    libvlc_event_manager_register_event_type( p_mi->p_event_manager, 
    325             libvlc_MediaInstancePaused, p_e ); 
     325            libvlc_MediaPlayerPaused, p_e ); 
    326326    libvlc_event_manager_register_event_type( p_mi->p_event_manager, 
    327             libvlc_MediaInstancePlayed, p_e ); 
     327            libvlc_MediaPlayerPlayed, p_e ); 
    328328    libvlc_event_manager_register_event_type( p_mi->p_event_manager, 
    329             libvlc_MediaInstancePositionChanged, p_e ); 
     329            libvlc_MediaPlayerPositionChanged, p_e ); 
    330330    libvlc_event_manager_register_event_type( p_mi->p_event_manager, 
    331             libvlc_MediaInstanceTimeChanged, p_e ); 
     331            libvlc_MediaPlayerTimeChanged, p_e ); 
    332332    libvlc_event_manager_register_event_type( p_mi->p_event_manager, 
    333             libvlc_MediaInstanceSeekableChanged, p_e ); 
     333            libvlc_MediaPlayerSeekableChanged, p_e ); 
    334334    libvlc_event_manager_register_event_type( p_mi->p_event_manager, 
    335             libvlc_MediaInstancePausableChanged, p_e ); 
     335            libvlc_MediaPlayerPausableChanged, p_e ); 
    336336 
    337337    return p_mi; 
    …… 
    648648    libvlc_event_t event; 
    649649    libvlc_media_set_state( p_mi->p_md, libvlc_Stopped, NULL); 
    650     event.type = libvlc_MediaInstanceStopped; 
     650    event.type = libvlc_MediaPlayerStopped; 
    651651    libvlc_event_send( p_mi->p_event_manager, &event ); 
    652652} 

  • src/control/testapi.c

    ree1330c r313a874  
    246246    libvlc_exception_t ex; 
    247247    libvlc_event_type_t mi_events[] = { 
    248         libvlc_MediaInstancePlayed, 
    249         libvlc_MediaInstancePaused, 
    250         libvlc_MediaInstanceEndReached, 
    251         libvlc_MediaInstanceStopped, 
    252         libvlc_MediaInstanceEncounteredError, 
    253         libvlc_MediaInstanceTimeChanged, 
    254         libvlc_MediaInstancePositionChanged, 
     248        libvlc_MediaPlayerPlayed, 
     249        libvlc_MediaPlayerPaused, 
     250        libvlc_MediaPlayerEndReached, 
     251        libvlc_MediaPlayerStopped, 
     252        libvlc_MediaPlayerEncounteredError, 
     253        libvlc_MediaPlayerTimeChanged, 
     254        libvlc_MediaPlayerPositionChanged, 
    255255    }; 
    256256    int i, mi_events_len = sizeof(mi_events)/sizeof(*mi_events);