[ekiga] Removed a little api from Ekiga::AudioInputCore
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Removed a little api from Ekiga::AudioInputCore
- Date: Mon, 27 Sep 2010 09:54:55 +0000 (UTC)
commit 3ab88cb4b28f3040e4a025270e8ad70c6dfa25fa
Author: Julien Puydt <jpuydt gnome org>
Date: Sun Sep 26 21:33:25 2010 +0200
Removed a little api from Ekiga::AudioInputCore
It wasn't used anyway... and it should make it possible to stop insisting
on having the audio input device available from startup (ie: even if we
don't need it yet anyway).
lib/engine/audioinput/audioinput-core.cpp | 16 ++++++----------
lib/engine/audioinput/audioinput-core.h | 8 --------
2 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/lib/engine/audioinput/audioinput-core.cpp b/lib/engine/audioinput/audioinput-core.cpp
index 7f1e4ca..aab8c0d 100644
--- a/lib/engine/audioinput/audioinput-core.cpp
+++ b/lib/engine/audioinput/audioinput-core.cpp
@@ -137,18 +137,11 @@ void AudioInputCore::get_devices (std::vector <AudioInputDevice> & devices)
}
-void AudioInputCore::set_device(const AudioInputDevice & device)
-{
- PWaitAndSignal m(core_mutex);
-
- internal_set_device(device);
-
- desired_device = device;
-}
-
void
AudioInputCore::set_device (const std::string& device_string)
{
+ PWaitAndSignal m(core_mutex);
+
std::vector<AudioInputDevice> devices;
AudioInputDevice device;
bool found = false;
@@ -176,7 +169,10 @@ AudioInputCore::set_device (const std::string& device_string)
device.name = AUDIO_INPUT_FALLBACK_DEVICE_NAME;
}
- set_device (device);
+ internal_set_device (device);
+
+ desired_device = device;
+
PTRACE(4, "AudioInputCore\tSet device to " << device.source << "/" << device.name);
}
diff --git a/lib/engine/audioinput/audioinput-core.h b/lib/engine/audioinput/audioinput-core.h
index 226c056..d2a1147 100644
--- a/lib/engine/audioinput/audioinput-core.h
+++ b/lib/engine/audioinput/audioinput-core.h
@@ -148,14 +148,6 @@ namespace Ekiga
void get_devices(std::vector <AudioInputDevice> & devices);
/** Set a specific device
- * This function sets the current audio input device. This function can
- * also be used while in a stream or in preview mode. In that case the old
- * device is closed and the new device opened automatically.
- * @param device the new device to be used.
- */
- void set_device(const AudioInputDevice & device);
-
- /** Set a specific device
* This functions sets the current audio input device.
* It can also be used while in a stream or in preview mode,
* in such a case the old device gets closed and the new device is opened.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]