[ekiga] Fix compilation with gcc 6
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Fix compilation with gcc 6
- Date: Mon, 19 Sep 2016 16:32:00 +0000 (UTC)
commit 628f2aec0c518de3c311724fb7a83acb8387f9e6
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date: Mon Sep 19 18:30:23 2016 +0200
Fix compilation with gcc 6
Methods were declared differently in the two classes.
lib/engine/audioinput/audioinput-manager.h | 8 ++++----
lib/engine/audiooutput/audiooutput-manager.h | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/lib/engine/audioinput/audioinput-manager.h b/lib/engine/audioinput/audioinput-manager.h
index 94892a7..9f70061 100644
--- a/lib/engine/audioinput/audioinput-manager.h
+++ b/lib/engine/audioinput/audioinput-manager.h
@@ -147,21 +147,21 @@ namespace Ekiga
* @param device the audio input device that was opened.
* @param config the current audio input device configuration (current volume, etc.).
*/
- boost::signals2::signal<void(AudioInputDevice, AudioInputSettings)> device_opened;
+ boost::signals2::signal<void(AudioInputDevice&, AudioInputSettings&)> device_opened;
/** This signal is emitted when an audio input device is closed.
* @param device the audio input device that was closed.
*/
- boost::signals2::signal<void(AudioInputDevice)> device_closed;
+ boost::signals2::signal<void(AudioInputDevice&)> device_closed;
/** This signal is emitted when an error occurs when opening a audio input device.
* @param device the audio input device that caused the error.
* @param error_code the audio input device error code.
*/
- boost::signals2::signal<void(AudioInputDevice, AudioInputErrorCodes)> device_error;
+ boost::signals2::signal<void(AudioInputDevice&, AudioInputErrorCodes&)> device_error;
- protected:
+ protected:
typedef struct ManagerState {
bool opened;
unsigned channels;
diff --git a/lib/engine/audiooutput/audiooutput-manager.h b/lib/engine/audiooutput/audiooutput-manager.h
index 4207d1a..f980292 100644
--- a/lib/engine/audiooutput/audiooutput-manager.h
+++ b/lib/engine/audiooutput/audiooutput-manager.h
@@ -151,22 +151,22 @@ namespace Ekiga
* @param device the audio output device that was opened.
* @param config the current audio output device configuration (current volume, etc.).
*/
- boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputSettings)> device_opened;
+ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&)> device_opened;
/** This signal is emitted when an audio output device is closed.
* @param prim whether the primary or secondary audio output device was closed.
* @param device the audio output device that was closed.
*/
- boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice)> device_closed;
+ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice&)> device_closed;
/** This signal is emitted when an error occurs when opening an audio output device.
* @param prim whether the primary or secondary audio output device caused the error.
* @param device the audio output device that caused the error.
* @param error_code the audio output device error code.
*/
- boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes)> device_error;
+ boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes&)> device_error;
- protected:
+ protected:
typedef struct ManagerState {
bool opened;
unsigned channels;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]