Commit 2064fa99 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Rework includes & prepare for shared library

parent c0707de9
......@@ -24,7 +24,7 @@
#define LIBVLC_EVENTMANAGER_HPP
#include <string>
#include <vlc/vlc.h>
#include "common.hpp"
#include "Internal.hpp"
namespace VLC
......@@ -120,7 +120,7 @@ class IVLMEventCb
virtual void mediaInstanceStatusError( const std::string&, const std::string& ) {}
};
class EventManager : Internal<libvlc_event_manager_t>
class VLCPP_API EventManager : public Internal<libvlc_event_manager_t>
{
public:
EventManager( const EventManager& em );
......
......@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc.hpp>
#include "vlc.hpp"
namespace VLC
{
......
......@@ -24,13 +24,16 @@
#ifndef LIBVLC_CXX_INSTANCE_H
#define LIBVLC_CXX_INSTANCE_H
#include <common.hpp>
#include <string>
#include <vector>
#include "common.hpp"
#include "Internal.hpp"
#include "structures.hpp"
namespace VLC
{
class Instance : public Internal<libvlc_instance_t>
class VLCPP_API Instance : public Internal<libvlc_instance_t>
{
public:
/**
......
......@@ -21,9 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc.hpp>
#include "EventManager.hpp"
#include "vlc.hpp"
namespace VLC
{
......
......@@ -24,8 +24,10 @@
#ifndef LIBVLC_CXX_MEDIA_H
#define LIBVLC_CXX_MEDIA_H
#include <common.hpp>
#include <vector>
#include "common.hpp"
#include "Internal.hpp"
#include "structures.hpp"
namespace VLC
{
......@@ -34,7 +36,7 @@ class MediaList;
class MediaPlayer;
class EventManager;
class Media : public Internal<libvlc_media_t>
class VLCPP_API Media : public Internal<libvlc_media_t>
{
public:
/**
......
......@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc.hpp>
#include "vlc.hpp"
#include "EventManager.hpp"
......
......@@ -24,7 +24,7 @@
#ifndef LIBVLC_CXX_MEDIADISCOVERER_H
#define LIBVLC_CXX_MEDIADISCOVERER_H
#include <common.hpp>
#include "common.hpp"
#include "Internal.hpp"
namespace VLC
......@@ -32,7 +32,7 @@ namespace VLC
class EventManager;
class MediaDiscoverer : public Internal<libvlc_media_discoverer_t>
class VLCPP_API MediaDiscoverer : public Internal<libvlc_media_discoverer_t>
{
public:
~MediaDiscoverer();
......
......@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc.hpp>
#include "vlc.hpp"
namespace VLC
{
......
......@@ -24,13 +24,13 @@
#ifndef LIBVLC_CXX_MEDIALIBRARY_H
#define LIBVLC_CXX_MEDIALIBRARY_H
#include <common.hpp>
#include "common.hpp"
#include "Internal.hpp"
namespace VLC
{
class MediaLibrary : public Internal<libvlc_media_library_t>
class VLCPP_API MediaLibrary : public Internal<libvlc_media_library_t>
{
public:
/**
......
......@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc.hpp>
#include "vlc.hpp"
#include "EventManager.hpp"
......
......@@ -24,7 +24,7 @@
#ifndef LIBVLC_CXX_MEDIALIST_H
#define LIBVLC_CXX_MEDIALIST_H
#include <common.hpp>
#include "common.hpp"
#include "Internal.hpp"
namespace VLC
......@@ -32,7 +32,7 @@ namespace VLC
class EventManager;
class MediaList : public Internal<libvlc_media_list_t>
class VLCPP_API MediaList : public Internal<libvlc_media_list_t>
{
public:
/**
......
......@@ -21,9 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc.hpp>
#include "EventManager.hpp"
#include "vlc.hpp"
namespace VLC
{
......
......@@ -24,7 +24,7 @@
#ifndef LIBVLC_CXX_MEDIALISTPLAYER_H
#define LIBVLC_CXX_MEDIALISTPLAYER_H
#include <common.hpp>
#include "common.hpp"
#include "Internal.hpp"
namespace VLC
......@@ -32,7 +32,7 @@ namespace VLC
class EventManager;
class MediaListPlayer : public Internal<libvlc_media_list_player_t>
class VLCPP_API MediaListPlayer : public Internal<libvlc_media_list_player_t>
{
public:
/**
......
......@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc.hpp>
#include "vlc.hpp"
#include "EventManager.hpp"
......
......@@ -24,7 +24,7 @@
#ifndef LIBVLC_CXX_MEDIAPLAYER_H
#define LIBVLC_CXX_MEDIAPLAYER_H
#include <common.hpp>
#include "common.hpp"
#include "Internal.hpp"
namespace VLC
......@@ -32,7 +32,7 @@ namespace VLC
class EventManager;
class MediaPlayer : public Internal<libvlc_media_player_t>
class VLCPP_API MediaPlayer : public Internal<libvlc_media_player_t>
{
public:
/**
......
......@@ -4,6 +4,7 @@
* Copyright © 2014 the VideoLAN team
*
* Authors: Alexey Sokolov <alexey@alexeysokolov.co.cc>
* Hugo Beauzée-Luyssen <hugo@beauzee.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
......@@ -20,22 +21,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/* This file is autogenerated */
#ifndef LIBVLC_CXX_COMMON_H
#define LIBVLC_CXX_COMMON_H
#include <stddef.h>
#include <string>
#include <stdexcept>
#include <vlc/vlc.h>
#include "structures.hpp"
namespace VLC {
#ifdef WIN32
#ifdef libvlcpp_EXPORTS
# define VLCPP_API __declspec(dllexport)
#else
# define VLCPP_API __declspec(dllimport)
#endif
#else
# define VLCPP_API
#endif
namespace VLC
{
class Instance;
class Video;
class MediaListPlayer;
......@@ -45,6 +47,6 @@ class Media;
class MediaLibrary;
class MediaList;
class Audio;
}
#endif
......@@ -21,7 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc.hpp>
#include "vlc.hpp"
namespace VLC
{
......
......@@ -24,6 +24,7 @@
#ifndef LIBVLC_CXX_STRUCTURES_H
#define LIBVLC_CXX_STRUCTURES_H
#include "common.hpp"
#include <vector>
namespace VLC
......@@ -32,7 +33,7 @@ namespace VLC
class Instance;
class Media;
class ModuleDescription
class VLCPP_API ModuleDescription
{
public:
const std::string& name() const;
......@@ -51,7 +52,7 @@ private:
};
class MediaTrack
class VLCPP_API MediaTrack
{
public:
enum Type
......@@ -107,7 +108,7 @@ private:
};
class AudioOutputDescription
class VLCPP_API AudioOutputDescription
{
public:
const std::string& name() const;
......@@ -121,7 +122,7 @@ private:
friend class Instance;
};
class AudioOutputDeviceDescription
class VLCPP_API AudioOutputDeviceDescription
{
public:
/**< Device identifier string */
......@@ -139,7 +140,7 @@ class AudioOutputDeviceDescription
friend class MediaPlayer;
};
class TrackDescription
class VLCPP_API TrackDescription
{
public:
int id() const;
......
......@@ -27,13 +27,13 @@
#ifndef LIBVLC_CXX_VLC_H
#define LIBVLC_CXX_VLC_H
#include <Instance.hpp>
#include <MediaListPlayer.hpp>
#include <MediaDiscoverer.hpp>
#include <MediaPlayer.hpp>
#include <Media.hpp>
#include <MediaLibrary.hpp>
#include <MediaList.hpp>
#include <EventManager.hpp>
#include "Instance.hpp"
#include "MediaListPlayer.hpp"
#include "MediaDiscoverer.hpp"
#include "MediaPlayer.hpp"
#include "Media.hpp"
#include "MediaLibrary.hpp"
#include "MediaList.hpp"
#include "EventManager.hpp"
#endif
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