Kaydet (Commit) 931decd0 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Move vlc/wrapper include files to common include directory

...that are inclued from both vlc and vlc/wrapper.  Change done in preparation
of loplugin:inlcudeform.

Change-Id: Ic7dc08b93d8a33b21dc64dfc0bfbe3952039f05b
Reviewed-on: https://gerrit.libreoffice.org/43556Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 96e68b99
......@@ -14,6 +14,7 @@ $(eval $(call gb_Library_set_componentfile,avmediavlc,avmedia/source/vlc/avmedia
$(eval $(call gb_Library_set_include,avmediavlc,\
$$(INCLUDE) \
-I$(SRCDIR)/avmedia/source/inc \
-I$(SRCDIR)/avmedia/source/vlc/inc \
))
$(eval $(call gb_Library_use_custom_headers,avmediavlc,\
......
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_COMMON_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_COMMON_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_COMMON_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_COMMON_HXX
namespace avmedia
{
......
......@@ -7,12 +7,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTHANDLER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTHANDLER_HXX
#include <functional>
#include <salhelper/thread.hxx>
#include "ThreadsafeQueue.hxx"
#include "wrapper/ThreadsafeQueue.hxx"
namespace avmedia
{
......
......@@ -7,11 +7,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTMANAGER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_EVENTMANAGER_HXX
#include <functional>
#include "Player.hxx"
#include "wrapper/Player.hxx"
struct libvlc_event_manager_t;
struct libvlc_event_t;
......
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_INSTANCE_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_INSTANCE_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_INSTANCE_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_INSTANCE_HXX
struct libvlc_instance_t;
......
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_MEDIA_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_MEDIA_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_MEDIA_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_MEDIA_HXX
struct libvlc_media_t;
......
......@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_PLAYER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_PLAYER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_PLAYER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_PLAYER_HXX
#if defined UNX
# include <stdint.h>
#endif
......
......@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_THREADSAFEQUEUE_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_THREADSAFEQUEUE_HXX
#include <queue>
#include <iostream>
#include <osl/mutex.hxx>
......@@ -79,5 +79,5 @@ void ThreadsafeQueue<T>::pop( T& data )
}
}
#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_THREADSAFEQUEUE_HXX
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -7,16 +7,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_WRAPPER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_WRAPPER_HXX
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_WRAPPER_HXX
#define INCLUDED_AVMEDIA_SOURCE_VLC_INC_WRAPPER_WRAPPER_HXX
#include "Common.hxx"
#include "EventHandler.hxx"
#include "EventManager.hxx"
#include "Instance.hxx"
#include "Media.hxx"
#include "Player.hxx"
#include "wrapper/Common.hxx"
#include "wrapper/EventHandler.hxx"
#include "wrapper/EventManager.hxx"
#include "wrapper/Instance.hxx"
#include "wrapper/Media.hxx"
#include "wrapper/Player.hxx"
#endif // INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_WRAPPER_HXX
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -6,7 +6,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "Common.hxx"
#include "wrapper/Common.hxx"
#include "SymbolLoader.hxx"
namespace
......
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "EventHandler.hxx"
#include "wrapper/EventHandler.hxx"
namespace avmedia
{
......
......@@ -7,9 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "EventManager.hxx"
#include "wrapper/EventManager.hxx"
#include "SymbolLoader.hxx"
#include "EventHandler.hxx"
#include "wrapper/EventHandler.hxx"
#include "Types.hxx"
namespace
......
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "Instance.hxx"
#include "wrapper/Instance.hxx"
#include "SymbolLoader.hxx"
namespace
......
......@@ -8,11 +8,11 @@
*/
#include <rtl/ustring.h>
#include "Media.hxx"
#include "wrapper/Media.hxx"
#include "SymbolLoader.hxx"
#include "Instance.hxx"
#include "wrapper/Instance.hxx"
#include "Types.hxx"
#include "Common.hxx"
#include "wrapper/Common.hxx"
struct libvlc_instance_t;
......
......@@ -9,10 +9,10 @@
#include <rtl/ustring.h>
#include "Types.hxx"
#include "Player.hxx"
#include "Media.hxx"
#include "wrapper/Player.hxx"
#include "wrapper/Media.hxx"
#include "SymbolLoader.hxx"
#include "Common.hxx"
#include "wrapper/Common.hxx"
struct libvlc_media_t;
......
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