Commit 70810d43 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #26839: client: move video_controls.h into client

parent 720ae97e
......@@ -59,7 +59,7 @@ noinst_HEADERS = \
$(BUILT_SOURCES)
if SFL_VIDEO
noinst_HEADERS+=video_controls.h
noinst_HEADERS+=../video_controls.h
endif
# Dbus service file
......
......@@ -30,7 +30,13 @@
#ifndef VIDEO_CONTROLS_H_
#define VIDEO_CONTROLS_H_
#include "dbus_cpp.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#if HAVE_DBUS
#include "dbus/dbus_cpp.h"
#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
/* This warning option only exists for gcc 4.6.0 and greater. */
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
......@@ -38,7 +44,7 @@
#pragma GCC diagnostic ignored "-Wignored-qualifiers"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include "video_controls-glue.h"
#include "dbus/video_controls-glue.h"
#pragma GCC diagnostic warning "-Wignored-qualifiers"
#pragma GCC diagnostic warning "-Wunused-parameter"
......@@ -47,6 +53,7 @@
#pragma GCC diagnostic warning "-Wunused-but-set-variable"
#endif
#endif // HAVE_DBUS
#include <tr1/memory> // for shared_ptr
#include "video/video_preferences.h"
......
......@@ -78,7 +78,7 @@
#endif
#ifdef SFL_VIDEO
#include "client/dbus/video_controls.h"
#include "client/video_controls.h"
#endif
#include "conference.h"
......
......@@ -36,7 +36,7 @@
#include "sdp.h"
#include "manager.h"
#ifdef SFL_VIDEO
#include "client/dbus/video_controls.h"
#include "client/video_controls.h"
#endif
namespace {
......
......@@ -61,7 +61,7 @@
#ifdef SFL_VIDEO
#include "video/video_rtp_session.h"
#include "client/dbus/video_controls.h"
#include "client/video_controls.h"
#endif
#ifdef __ANDROID__
......
......@@ -31,7 +31,7 @@
#include "video_receive_thread.h"
#include "socket_pair.h"
#include "client/dbus/video_controls.h"
#include "client/video_controls.h"
#include "check.h"
#include "packet_handle.h"
......
......@@ -30,7 +30,7 @@
#include "video_send_thread.h"
#include "socket_pair.h"
#include "client/dbus/video_controls.h"
#include "client/video_controls.h"
#include "packet_handle.h"
#include "check.h"
......
......@@ -52,7 +52,7 @@ extern "C" {
#include "video_v4l2_list.h"
#include "manager.h"
#include "client/dbus/video_controls.h"
#include "client/video_controls.h"
namespace sfl_video {
......
Supports Markdown
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