[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source

[Minh Ngo]

 avmedia/source/vlc/wrapper/EventManager.cxx |   76 +---------------------------
 1 file changed, 4 insertions(+), 72 deletions(-)

New commits:
commit 1eee6ec3e0773d8c760987c0e98bdc1088b3e6d1
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Sat Aug 10 11:26:14 2013 +0300

    Includes for building.
    
    Change-Id: I55f9ea19f0be650bcf9dd63cd7a6f86a01679b62

diff --git a/avmedia/source/vlc/wrapper/EventManager.cxx b/avmedia/source/vlc/wrapper/EventManager.cxx
index 6ae5bc9..bafd4a9 100644
--- a/avmedia/source/vlc/wrapper/EventManager.cxx
+++ b/avmedia/source/vlc/wrapper/EventManager.cxx
@@ -1,84 +1,16 @@
+#include <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_events.h>
+
 #include "EventManager.hxx"
 #include "SymbolLoader.hxx"
 
-typedef struct libvlc_event_t
-{
-    int   type;
-    void *p_obj;
-    union
-    {
-        struct
-        {
-            void *p;
-        } media_meta_changed;
-    } u;
-} libvlc_event_t;
-
-typedef int libvlc_event_type_t;
 typedef void ( *libvlc_callback_t ) ( const struct libvlc_event_t *, void * );
 
 namespace VLC
 {
     namespace
     {
-        enum libvlc_event_e {
-            libvlc_MediaMetaChanged=0,
-            libvlc_MediaSubItemAdded,
-            libvlc_MediaDurationChanged,
-            libvlc_MediaParsedChanged,
-            libvlc_MediaFreed,
-            libvlc_MediaStateChanged,
-
-            libvlc_MediaPlayerMediaChanged=0x100,
-            libvlc_MediaPlayerNothingSpecial,
-            libvlc_MediaPlayerOpening,
-            libvlc_MediaPlayerBuffering,
-            libvlc_MediaPlayerPlaying,
-            libvlc_MediaPlayerPaused,
-            libvlc_MediaPlayerStopped,
-            libvlc_MediaPlayerForward,
-            libvlc_MediaPlayerBackward,
-            libvlc_MediaPlayerEndReached,
-            libvlc_MediaPlayerEncounteredError,
-            libvlc_MediaPlayerTimeChanged,
-            libvlc_MediaPlayerPositionChanged,
-            libvlc_MediaPlayerSeekableChanged,
-            libvlc_MediaPlayerPausableChanged,
-            libvlc_MediaPlayerTitleChanged,
-            libvlc_MediaPlayerSnapshotTaken,
-            libvlc_MediaPlayerLengthChanged,
-            libvlc_MediaPlayerVout,
-
-            libvlc_MediaListItemAdded=0x200,
-            libvlc_MediaListWillAddItem,
-            libvlc_MediaListItemDeleted,
-            libvlc_MediaListWillDeleteItem,
-
-            libvlc_MediaListViewItemAdded=0x300,
-            libvlc_MediaListViewWillAddItem,
-            libvlc_MediaListViewItemDeleted,
-            libvlc_MediaListViewWillDeleteItem,
-
-            libvlc_MediaListPlayerPlayed=0x400,
-            libvlc_MediaListPlayerNextItemSet,
-            libvlc_MediaListPlayerStopped,
-
-            libvlc_MediaDiscovererStarted=0x500,
-            libvlc_MediaDiscovererEnded,
-
-            libvlc_VlmMediaAdded=0x600,
-            libvlc_VlmMediaRemoved,
-            libvlc_VlmMediaChanged,
-            libvlc_VlmMediaInstanceStarted,
-            libvlc_VlmMediaInstanceStopped,
-            libvlc_VlmMediaInstanceStatusInit,
-            libvlc_VlmMediaInstanceStatusOpening,
-            libvlc_VlmMediaInstanceStatusPlaying,
-            libvlc_VlmMediaInstanceStatusPause,
-            libvlc_VlmMediaInstanceStatusEnd,
-            libvlc_VlmMediaInstanceStatusError
-        };
-
         libvlc_event_manager_t* ( *libvlc_media_player_event_manager ) ( libvlc_media_player_t *p_mi );
         int ( *libvlc_event_attach ) ( libvlc_event_manager_t *p_event_manager,
                                        libvlc_event_type_t i_event_type,