summaryrefslogtreecommitdiff
path: root/avmedia/inc
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2011-08-03 15:08:56 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2011-08-22 15:18:52 +0200
commite85875b9018cc7c286ff9d40789d15e003ca9845 (patch)
tree246bf578e28c6c760e6544d22c001b9d7e9667a4 /avmedia/inc
parentfee5ca25dcb18cbdcfb9406905ece5d65d21b88e (diff)
convert avmedia to gbuild
Diffstat (limited to 'avmedia/inc')
-rw-r--r--avmedia/inc/avmedia/avmediadllapi.h16
-rw-r--r--avmedia/inc/avmedia/mediaitem.hxx3
-rw-r--r--avmedia/inc/avmedia/mediaplayer.hxx7
-rw-r--r--avmedia/inc/avmedia/mediatoolbox.hxx7
-rw-r--r--avmedia/inc/avmedia/mediawindow.hxx7
5 files changed, 30 insertions, 10 deletions
diff --git a/avmedia/inc/avmedia/avmediadllapi.h b/avmedia/inc/avmedia/avmediadllapi.h
new file mode 100644
index 000000000000..93bcdf920eef
--- /dev/null
+++ b/avmedia/inc/avmedia/avmediadllapi.h
@@ -0,0 +1,16 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef INCLUDED_AVMEDIADLLAPI_H
+#define INCLUDED_AVMEDIADLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(AVMEDIA_DLLIMPLEMENTATION)
+#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define AVMEDIA_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_AVMEDIADLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index 4ae504fc58c9..a535040c0030 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -32,6 +32,7 @@
#include <tools/rtti.hxx>
#include <svl/poolitem.hxx>
#include <com/sun/star/media/ZoomLevel.hpp>
+#include <avmedia/avmediadllapi.h>
#define AVMEDIA_SETMASK_NONE ((sal_uInt32)(0x00000000))
#define AVMEDIA_SETMASK_STATE ((sal_uInt32)(0x00000001))
@@ -65,7 +66,7 @@ enum MediaState
// - MediaItem -
// -------------
-class MediaItem : public SfxPoolItem
+class AVMEDIA_DLLPUBLIC MediaItem : public SfxPoolItem
{
public:
TYPEINFO();
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index 2d49f80e2af7..f11f4c070ba3 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -32,6 +32,7 @@
#include <sfx2/ctrlitem.hxx>
#include <sfx2/dockwin.hxx>
#include <tools/urlobj.hxx>
+#include <avmedia/avmediadllapi.h>
// -----------
// - Defines -
@@ -50,7 +51,7 @@ namespace avmedia
// - MediaPlayer -
// ---------------
-class MediaPlayer : public SfxChildWindow
+class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow
{
public:
MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
@@ -65,7 +66,7 @@ public:
class MediaWindow;
-class MediaFloater : public SfxDockingWindow
+class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow
{
public:
@@ -89,7 +90,7 @@ private:
long mnDummy1;
long mnDummy2;
- void implInit();
+ AVMEDIA_DLLPRIVATE void implInit();
};
}
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index 3b5023a4c908..2f406ca591b2 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -31,6 +31,7 @@
#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
+#include <avmedia/avmediadllapi.h>
namespace avmedia
{
@@ -41,7 +42,7 @@ namespace avmedia
class MediaItem;
-class MediaToolBoxControl : public SfxToolBoxControl
+class AVMEDIA_DLLPUBLIC MediaToolBoxControl : public SfxToolBoxControl
{
friend class MediaToolBoxControl_Impl;
@@ -57,8 +58,8 @@ public:
private:
- void implUpdateMediaControl();
- void implExecuteMediaControl( const MediaItem& rItem );
+ AVMEDIA_DLLPUBLIC void implUpdateMediaControl();
+ AVMEDIA_DLLPUBLIC void implExecuteMediaControl( const MediaItem& rItem );
};
}
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index aee3397c8a8f..9de4ab6bbfb0 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -36,6 +36,7 @@
#include <com/sun/star/media/XPlayer.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/uno/XInterface.hpp>
+#include <avmedia/avmediadllapi.h>
// -----------
// - Defines -
@@ -72,7 +73,7 @@ namespace avmedia
// - MediaWindow -
// ---------------
- class MediaWindow
+ class AVMEDIA_DLLPUBLIC MediaWindow
{
public:
MediaWindow( Window* parent, bool bInternalMediaControl );
@@ -131,8 +132,8 @@ namespace avmedia
private:
// default: disabled copy/assignment
- MediaWindow(const MediaWindow&);
- MediaWindow& operator =( const MediaWindow& );
+ AVMEDIA_DLLPRIVATE MediaWindow(const MediaWindow&);
+ AVMEDIA_DLLPRIVATE MediaWindow& operator =( const MediaWindow& );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxIFace;
priv::MediaWindowImpl* mpImpl;