Kaydet (Commit) ea12c1f1 authored tarafından Michael Meeks's avatar Michael Meeks

avmedia: vlc - extract required types to their own header.

Change-Id: I63d4aa217f57186ae37a9398b845fa734ef2cd5b
üst c6040d9b
......@@ -21,7 +21,6 @@
#define _VLCPLAYER_HXX
#include "vlccommon.hxx"
#include <vlc/vlc.h>
#include <boost/shared_ptr.hpp>
#include <cppuhelper/compbase2.hxx>
#include <com/sun/star/media/XPlayer.hpp>
......
......@@ -7,15 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <vlc/libvlc.h>
#include <vlc/libvlc_media.h>
#include <vlc/libvlc_events.h>
#include "EventManager.hxx"
#include "SymbolLoader.hxx"
#include "EventHandler.hxx"
typedef void ( *libvlc_callback_t ) ( const struct libvlc_event_t *, void * );
#include "Types.hxx"
namespace VLC
{
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* Typedefs and structures that represent the libvlc API / ABI */
#ifndef _WRAPPER_TYPES_HXX
#define _WRAPPER_TYPES_HXX
extern "C" {
// basic callback / event types we use
typedef int libvlc_event_type_t;
typedef struct libvlc_event_manager_t libvlc_event_manager_t;
typedef void ( *libvlc_callback_t ) ( const struct libvlc_event_t *, void * );
// the enumeration values we use cf. libvlc_events.h
#define libvlc_MediaPlayerPaused 0x105
#define libvlc_MediaPlayerEndReached 0x109
// event structure pieces we use
typedef struct libvlc_event_t
{
int type; // event type
void *p_obj; // object emitting that event
union // so far we don't need this.
{
struct {
const char *dummy1;
const char *dummy2;
} padding;
} u;
} libvlc_event_t;
}
#endif // _WRAPPER_TYPES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment