ekiga r6254 - in trunk: . lib/engine/audioinput/ptlib lib/engine/audioinput/skel lib/engine/audiooutput/ptlib lib/engine/audiooutput/skel lib/engine/display/dx lib/engine/display/skel lib/engine/display/x lib/engine/vidinput/ptlib lib/engine/vidinput/skel src/gui
- From: mschneid svn gnome org
- To: svn-commits-list gnome org
- Subject: ekiga r6254 - in trunk: . lib/engine/audioinput/ptlib lib/engine/audioinput/skel lib/engine/audiooutput/ptlib lib/engine/audiooutput/skel lib/engine/display/dx lib/engine/display/skel lib/engine/display/x lib/engine/vidinput/ptlib lib/engine/vidinput/skel src/gui
- Date: Mon, 12 May 2008 20:12:14 +0100 (BST)
Author: mschneid
Date: Mon May 12 19:12:13 2008
New Revision: 6254
URL: http://svn.gnome.org/viewvc/ekiga?rev=6254&view=rev
Log:
Some more alignments and cosmetics for callbacks and
the error enums.
Modified:
trunk/ChangeLog
trunk/lib/engine/audioinput/ptlib/audioinput-manager-ptlib.cpp
trunk/lib/engine/audioinput/skel/audioinput-core.cpp
trunk/lib/engine/audioinput/skel/audioinput-core.h
trunk/lib/engine/audioinput/skel/audioinput-info.h
trunk/lib/engine/audiooutput/ptlib/audiooutput-manager-ptlib.cpp
trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp
trunk/lib/engine/audiooutput/skel/audiooutput-core.h
trunk/lib/engine/audiooutput/skel/audiooutput-info.h
trunk/lib/engine/display/dx/display-manager-dx.cpp
trunk/lib/engine/display/skel/display-core.cpp
trunk/lib/engine/display/skel/display-core.h
trunk/lib/engine/display/skel/display-manager.h
trunk/lib/engine/display/x/display-manager-x.cpp
trunk/lib/engine/vidinput/ptlib/vidinput-manager-ptlib.cpp
trunk/lib/engine/vidinput/skel/vidinput-core.cpp
trunk/lib/engine/vidinput/skel/vidinput-core.h
trunk/lib/engine/vidinput/skel/vidinput-info.h
trunk/lib/engine/vidinput/skel/vidinput-manager.h
trunk/src/gui/assistant.cpp
trunk/src/gui/main.cpp
trunk/src/gui/preferences.cpp
Modified: trunk/lib/engine/audioinput/ptlib/audioinput-manager-ptlib.cpp
==============================================================================
--- trunk/lib/engine/audioinput/ptlib/audioinput-manager-ptlib.cpp (original)
+++ trunk/lib/engine/audioinput/ptlib/audioinput-manager-ptlib.cpp Mon May 12 19:12:13 2008
@@ -110,11 +110,11 @@
samplerate,
bits_per_sample);
- Ekiga::AudioInputErrorCodes error_code = Ekiga::AUDIO_ERR_NONE;
+ Ekiga::AudioInputErrorCodes error_code = Ekiga::AI_ERROR_NONE;
if (!input_device)
- error_code = Ekiga::AUDIO_ERR_DEVICE;
+ error_code = Ekiga::AI_ERROR_DEVICE;
- if (error_code != Ekiga::AUDIO_ERR_NONE) {
+ if (error_code != Ekiga::AI_ERROR_NONE) {
PTRACE(1, "GMAudioInputManager_ptlib\tEncountered error " << error_code << " while opening device ");
runtime.run_in_main (sigc::bind (device_error.make_slot (), current_state.device, error_code));
return false;
@@ -170,7 +170,7 @@
}
else {
PTRACE(1, "GMAudioInputManager_ptlib\tEncountered error while trying to read data");
- runtime.run_in_main (sigc::bind (device_error.make_slot (), current_state.device, Ekiga::AUDIO_ERR_READ));
+ runtime.run_in_main (sigc::bind (device_error.make_slot (), current_state.device, Ekiga::AI_ERROR_READ));
}
}
return ret;
Modified: trunk/lib/engine/audioinput/skel/audioinput-core.cpp
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-core.cpp (original)
+++ trunk/lib/engine/audioinput/skel/audioinput-core.cpp Mon May 12 19:12:13 2008
@@ -165,9 +165,9 @@
managers.insert (&manager);
manager_added.emit (manager);
- manager.device_error.connect (sigc::bind (sigc::mem_fun (this, &AudioInputCore::on_audioinputdevice_error), &manager));
- manager.device_opened.connect (sigc::bind (sigc::mem_fun (this, &AudioInputCore::on_audioinputdevice_opened), &manager));
- manager.device_closed.connect (sigc::bind (sigc::mem_fun (this, &AudioInputCore::on_audioinputdevice_closed), &manager));
+ manager.device_error.connect (sigc::bind (sigc::mem_fun (this, &AudioInputCore::on_device_error), &manager));
+ manager.device_opened.connect (sigc::bind (sigc::mem_fun (this, &AudioInputCore::on_device_opened), &manager));
+ manager.device_closed.connect (sigc::bind (sigc::mem_fun (this, &AudioInputCore::on_device_closed), &manager));
}
@@ -350,23 +350,21 @@
new_stream_volume = volume;
}
-
-void AudioInputCore::on_audioinputdevice_error (AudioInputDevice audioinput_device, AudioInputErrorCodes error_code, AudioInputManager *manager)
+void AudioInputCore::on_device_opened (AudioInputDevice device,
+ AudioInputConfig audioinput_config,
+ AudioInputManager *manager)
{
- audioinputdevice_error.emit (*manager, audioinput_device, error_code);
+ device_opened.emit (*manager, device, audioinput_config);
}
-
-void AudioInputCore::on_audioinputdevice_opened (AudioInputDevice audioinput_device,
- AudioInputConfig audioinput_config,
- AudioInputManager *manager)
+void AudioInputCore::on_device_closed (AudioInputDevice device, AudioInputManager *manager)
{
- audioinputdevice_opened.emit (*manager, audioinput_device, audioinput_config);
+ device_closed.emit (*manager, device);
}
-void AudioInputCore::on_audioinputdevice_closed (AudioInputDevice audioinput_device, AudioInputManager *manager)
+void AudioInputCore::on_device_error (AudioInputDevice device, AudioInputErrorCodes error_code, AudioInputManager *manager)
{
- audioinputdevice_closed.emit (*manager, audioinput_device);
+ device_error.emit (*manager, device, error_code);
}
void AudioInputCore::internal_set_audioinput_device(const AudioInputDevice & audioinput_device)
@@ -490,7 +488,7 @@
internal_set_audioinput_device(desired_device);
}
- runtime.run_in_main (sigc::bind (audioinputdevice_added.make_slot (), audioinput_device));
+ runtime.run_in_main (sigc::bind (device_added.make_slot (), audioinput_device));
}
}
}
@@ -516,7 +514,7 @@
internal_set_audioinput_device( new_audioinput_device);
}
- runtime.run_in_main (sigc::bind (audioinputdevice_removed.make_slot (), audioinput_device));
+ runtime.run_in_main (sigc::bind (device_removed.make_slot (), audioinput_device));
}
}
}
Modified: trunk/lib/engine/audioinput/skel/audioinput-core.h
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-core.h (original)
+++ trunk/lib/engine/audioinput/skel/audioinput-core.h Mon May 12 19:12:13 2008
@@ -180,18 +180,18 @@
/** See audioinput-manager.h for the API
*/
- sigc::signal<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> audioinputdevice_error;
- sigc::signal<void, AudioInputDevice> audioinputdevice_added;
- sigc::signal<void, AudioInputDevice> audioinputdevice_removed;
- sigc::signal<void, AudioInputManager &, AudioInputDevice &, AudioInputConfig&> audioinputdevice_opened;
- sigc::signal<void, AudioInputManager &, AudioInputDevice &> audioinputdevice_closed;
+ sigc::signal<void, AudioInputManager &, AudioInputDevice &, AudioInputConfig&> device_opened;
+ sigc::signal<void, AudioInputManager &, AudioInputDevice &> device_closed;
+ sigc::signal<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> device_error;
+ sigc::signal<void, AudioInputDevice> device_added;
+ sigc::signal<void, AudioInputDevice> device_removed;
private:
- void on_audioinputdevice_error (AudioInputDevice audioinput_device, AudioInputErrorCodes error_code, AudioInputManager *manager);
- void on_audioinputdevice_opened (AudioInputDevice audioinput_device,
- AudioInputConfig vidinput_config,
- AudioInputManager *manager);
- void on_audioinputdevice_closed (AudioInputDevice audioinput_device, AudioInputManager *manager);
+ void on_device_opened (AudioInputDevice device,
+ AudioInputConfig vidinput_config,
+ AudioInputManager *manager);
+ void on_device_closed (AudioInputDevice device, AudioInputManager *manager);
+ void on_device_error (AudioInputDevice device, AudioInputErrorCodes error_code, AudioInputManager *manager);
void internal_set_audioinput_device(const AudioInputDevice & audioinput_device);
void internal_open (unsigned channels, unsigned samplerate, unsigned bits_per_sample);
Modified: trunk/lib/engine/audioinput/skel/audioinput-info.h
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-info.h (original)
+++ trunk/lib/engine/audioinput/skel/audioinput-info.h Mon May 12 19:12:13 2008
@@ -51,9 +51,9 @@
};
enum AudioInputErrorCodes {
- AUDIO_ERR_NONE = 0,
- AUDIO_ERR_DEVICE,
- AUDIO_ERR_READ
+ AI_ERROR_NONE = 0,
+ AI_ERROR_DEVICE,
+ AI_ERROR_READ
};
};
Modified: trunk/lib/engine/audiooutput/ptlib/audiooutput-manager-ptlib.cpp
==============================================================================
--- trunk/lib/engine/audiooutput/ptlib/audiooutput-manager-ptlib.cpp (original)
+++ trunk/lib/engine/audiooutput/ptlib/audiooutput-manager-ptlib.cpp Mon May 12 19:12:13 2008
@@ -111,11 +111,11 @@
samplerate,
bits_per_sample);
- Ekiga::AudioOutputErrorCodes error_code = Ekiga::_AUDIO_ERR_NONE;
+ Ekiga::AudioOutputErrorCodes error_code = Ekiga::AO_ERROR_NONE;
if (!output_device[primarySecondary])
- error_code = Ekiga::_AUDIO_ERR_DEVICE;
+ error_code = Ekiga::AO_ERROR_DEVICE;
- if (error_code != Ekiga::_AUDIO_ERR_NONE) {
+ if (error_code != Ekiga::AO_ERROR_NONE) {
PTRACE(1, "GMAudioOutputManager_ptlib\tEncountered error " << error_code << " while opening device[" << primarySecondary << "]");
runtime.run_in_main (sigc::bind (device_error.make_slot (), primarySecondary, current_state[primarySecondary].device, error_code));
return false;
@@ -172,7 +172,7 @@
}
else {
PTRACE(1, "GMAudioOutputManager_ptlib\tEncountered error while trying to write data");
- runtime.run_in_main (sigc::bind (device_error.make_slot (), primarySecondary, current_state[primarySecondary].device, Ekiga::_AUDIO_ERR_WRITE));
+ runtime.run_in_main (sigc::bind (device_error.make_slot (), primarySecondary, current_state[primarySecondary].device, Ekiga::AO_ERROR_WRITE));
}
}
Modified: trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp (original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp Mon May 12 19:12:13 2008
@@ -89,9 +89,9 @@
managers.insert (&manager);
manager_added.emit (manager);
- manager.device_error.connect (sigc::bind (sigc::mem_fun (this, &AudioOutputCore::on_audiooutputdevice_error), &manager));
- manager.device_opened.connect (sigc::bind (sigc::mem_fun (this, &AudioOutputCore::on_audiooutputdevice_opened), &manager));
- manager.device_closed.connect (sigc::bind (sigc::mem_fun (this, &AudioOutputCore::on_audiooutputdevice_closed), &manager));
+ manager.device_error.connect (sigc::bind (sigc::mem_fun (this, &AudioOutputCore::on_device_error), &manager));
+ manager.device_opened.connect (sigc::bind (sigc::mem_fun (this, &AudioOutputCore::on_device_opened), &manager));
+ manager.device_closed.connect (sigc::bind (sigc::mem_fun (this, &AudioOutputCore::on_device_closed), &manager));
}
void AudioOutputCore::visit_managers (sigc::slot<bool, AudioOutputManager &> visitor)
@@ -346,25 +346,24 @@
}
-void AudioOutputCore::on_audiooutputdevice_error (AudioOutputPrimarySecondary primarySecondary, AudioOutputDevice audiooutput_device, AudioOutputErrorCodes error_code, AudioOutputManager *manager)
+void AudioOutputCore::on_device_opened (AudioOutputPrimarySecondary primarySecondary,
+ AudioOutputDevice device,
+ AudioOutputConfig config,
+ AudioOutputManager *manager)
{
- audiooutputdevice_error.emit (*manager, primarySecondary, audiooutput_device, error_code);
+ device_opened.emit (*manager, primarySecondary, device, config);
}
-void AudioOutputCore::on_audiooutputdevice_opened (AudioOutputPrimarySecondary primarySecondary,
- AudioOutputDevice audiooutput_device,
- AudioOutputConfig audiooutput_config,
- AudioOutputManager *manager)
+void AudioOutputCore::on_device_closed (AudioOutputPrimarySecondary primarySecondary, AudioOutputDevice device, AudioOutputManager *manager)
{
- audiooutputdevice_opened.emit (*manager, primarySecondary, audiooutput_device, audiooutput_config);
+ device_closed.emit (*manager, primarySecondary, device);
}
-void AudioOutputCore::on_audiooutputdevice_closed (AudioOutputPrimarySecondary primarySecondary, AudioOutputDevice audiooutput_device, AudioOutputManager *manager)
+void AudioOutputCore::on_device_error (AudioOutputPrimarySecondary primarySecondary, AudioOutputDevice device, AudioOutputErrorCodes error_code, AudioOutputManager *manager)
{
- audiooutputdevice_closed.emit (*manager, primarySecondary, audiooutput_device);
+ device_error.emit (*manager, primarySecondary, device, error_code);
}
-
bool AudioOutputCore::internal_open (AudioOutputPrimarySecondary primarySecondary, unsigned channels, unsigned samplerate, unsigned bits_per_sample)
{
PTRACE(4, "AudioOutputCore\tOpening device["<<primarySecondary<<"] with " << channels<< "-" << samplerate << "/" << bits_per_sample);
@@ -469,7 +468,7 @@
internal_set_prim_audiooutput_device(desired_primary_device);
}
- runtime.run_in_main (sigc::bind (audiooutputdevice_added.make_slot (), audiooutput_device));
+ runtime.run_in_main (sigc::bind (device_added.make_slot (), audiooutput_device));
}
}
}
@@ -495,7 +494,7 @@
internal_set_prim_audiooutput_device(new_audiooutput_device);
}
- runtime.run_in_main (sigc::bind (audiooutputdevice_removed.make_slot (), audiooutput_device));
+ runtime.run_in_main (sigc::bind (device_removed.make_slot (), audiooutput_device));
}
}
}
Modified: trunk/lib/engine/audiooutput/skel/audiooutput-core.h
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-core.h (original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-core.h Mon May 12 19:12:13 2008
@@ -166,19 +166,19 @@
/** See audiooutput-manager.h for the API
*/
- sigc::signal<void, AudioOutputManager &, AudioOutputPrimarySecondary, AudioOutputDevice&, AudioOutputErrorCodes> audiooutputdevice_error;
- sigc::signal<void, AudioOutputDevice> audiooutputdevice_added;
- sigc::signal<void, AudioOutputDevice> audiooutputdevice_removed;
- sigc::signal<void, AudioOutputManager &, AudioOutputPrimarySecondary, AudioOutputDevice&, AudioOutputConfig&> audiooutputdevice_opened;
- sigc::signal<void, AudioOutputManager &, AudioOutputPrimarySecondary, AudioOutputDevice&> audiooutputdevice_closed;
+ sigc::signal<void, AudioOutputManager &, AudioOutputPrimarySecondary, AudioOutputDevice&, AudioOutputConfig&> device_opened;
+ sigc::signal<void, AudioOutputManager &, AudioOutputPrimarySecondary, AudioOutputDevice&> device_closed;
+ sigc::signal<void, AudioOutputManager &, AudioOutputPrimarySecondary, AudioOutputDevice&, AudioOutputErrorCodes> device_error;
+ sigc::signal<void, AudioOutputDevice> device_added;
+ sigc::signal<void, AudioOutputDevice> device_removed;
private:
- void on_audiooutputdevice_error (AudioOutputPrimarySecondary primarySecondary, AudioOutputDevice audiooutput_device, AudioOutputErrorCodes error_code, AudioOutputManager *manager);
- void on_audiooutputdevice_opened (AudioOutputPrimarySecondary primarySecondary,
- AudioOutputDevice audiooutput_device,
- AudioOutputConfig vidinput_config,
- AudioOutputManager *manager);
- void on_audiooutputdevice_closed (AudioOutputPrimarySecondary primarySecondary, AudioOutputDevice audiooutput_device, AudioOutputManager *manager);
+ void on_device_opened (AudioOutputPrimarySecondary primarySecondary,
+ AudioOutputDevice device,
+ AudioOutputConfig config,
+ AudioOutputManager *manager);
+ void on_device_closed (AudioOutputPrimarySecondary primarySecondary, AudioOutputDevice device, AudioOutputManager *manager);
+ void on_device_error (AudioOutputPrimarySecondary primarySecondary, AudioOutputDevice device, AudioOutputErrorCodes error_code, AudioOutputManager *manager);
void internal_set_prim_audiooutput_device(const AudioOutputDevice & audiooutput_device);
void internal_set_device (AudioOutputPrimarySecondary primarySecondary, const AudioOutputDevice & audiooutput_device);
Modified: trunk/lib/engine/audiooutput/skel/audiooutput-info.h
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-info.h (original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-info.h Mon May 12 19:12:13 2008
@@ -51,9 +51,9 @@
};
enum AudioOutputErrorCodes {
- _AUDIO_ERR_NONE = 0,
- _AUDIO_ERR_DEVICE,
- _AUDIO_ERR_WRITE
+ AO_ERROR_NONE = 0,
+ AO_ERROR_DEVICE,
+ AO_ERROR_WRITE
};
enum AudioOutputPrimarySecondary {
Modified: trunk/lib/engine/display/dx/display-manager-dx.cpp
==============================================================================
--- trunk/lib/engine/display/dx/display-manager-dx.cpp (original)
+++ trunk/lib/engine/display/dx/display-manager-dx.cpp Mon May 12 19:12:13 2008
@@ -190,13 +190,13 @@
// if (!status)
// close_frame_display ();
- runtime.run_in_main (sigc::bind (hw_accel_status_changed.make_slot (), hw_accel_status));
+ runtime.run_in_main (sigc::bind (device_opened.make_slot (), hw_accel_status));
}
void
GMVideoOutputManager_dx::close_frame_display ()
{
- runtime.run_in_main (sigc::bind (hw_accel_status_changed.make_slot (), NO_VIDEO));
+ runtime.run_in_main (device_closed.make_slot ());
if (dxWindow) {
Modified: trunk/lib/engine/display/skel/display-core.cpp
==============================================================================
--- trunk/lib/engine/display/skel/display-core.cpp (original)
+++ trunk/lib/engine/display/skel/display-core.cpp Mon May 12 19:12:13 2008
@@ -84,10 +84,11 @@
managers.insert (&manager);
manager_added.emit (manager);
+ manager.device_opened.connect (sigc::bind (sigc::mem_fun (this, &DisplayCore::on_device_opened), &manager));
+ manager.device_closed.connect (sigc::bind (sigc::mem_fun (this, &DisplayCore::on_device_closed), &manager));
manager.display_mode_changed.connect (sigc::bind (sigc::mem_fun (this, &DisplayCore::on_display_mode_changed), &manager));
manager.fullscreen_mode_changed.connect (sigc::bind (sigc::mem_fun (this, &DisplayCore::on_fullscreen_mode_changed), &manager));
manager.display_size_changed.connect (sigc::bind (sigc::mem_fun (this, &DisplayCore::on_display_size_changed), &manager));
- manager.hw_accel_status_changed.connect (sigc::bind (sigc::mem_fun (this, &DisplayCore::on_hw_accel_status_changed), &manager));
manager.logo_update_required.connect (sigc::bind (sigc::mem_fun (this, &DisplayCore::on_logo_update_required), &manager));
}
@@ -199,6 +200,16 @@
}
+void DisplayCore::on_device_opened (HwAccelStatus hw_accel_status, VideoOutputManager *manager)
+{
+ device_opened.emit (*manager, hw_accel_status);
+}
+
+void DisplayCore::on_device_closed ( VideoOutputManager *manager)
+{
+ device_closed.emit (*manager);
+}
+
void DisplayCore::on_display_mode_changed (DisplayMode display, VideoOutputManager *manager)
{
display_mode_changed.emit (*manager, display);
@@ -214,11 +225,6 @@
display_size_changed.emit (*manager, width, height);
}
-void DisplayCore::on_hw_accel_status_changed (HwAccelStatus hw_accel_status, VideoOutputManager *manager)
-{
- hw_accel_status_changed.emit (*manager, hw_accel_status);
-}
-
void DisplayCore::on_logo_update_required (VideoOutputManager *manager)
{
logo_update_required.emit (*manager);
Modified: trunk/lib/engine/display/skel/display-core.h
==============================================================================
--- trunk/lib/engine/display/skel/display-core.h (original)
+++ trunk/lib/engine/display/skel/display-core.h Mon May 12 19:12:13 2008
@@ -130,10 +130,11 @@
/** See display-manager.h for the API
*/
+ sigc::signal<void, VideoOutputManager &, HwAccelStatus> device_opened;
+ sigc::signal<void, VideoOutputManager &> device_closed;
sigc::signal<void, VideoOutputManager &, DisplayMode> display_mode_changed;
sigc::signal<void, VideoOutputManager &, FSToggle> fullscreen_mode_changed;
sigc::signal<void, VideoOutputManager &, unsigned, unsigned> display_size_changed;
- sigc::signal<void, VideoOutputManager &, HwAccelStatus> hw_accel_status_changed;
sigc::signal<void, VideoOutputManager &> logo_update_required;
/*** Statistics ***/
@@ -141,10 +142,12 @@
_display_stats = display_stats;
};
private:
+ void on_device_opened (HwAccelStatus hw_accel_status, VideoOutputManager *manager);
+ void on_device_closed (VideoOutputManager *manager);
+
void on_display_mode_changed (DisplayMode display, VideoOutputManager *manager);
void on_fullscreen_mode_changed (FSToggle toggle, VideoOutputManager *manager);
void on_display_size_changed ( unsigned width, unsigned height, VideoOutputManager *manager);
- void on_hw_accel_status_changed (HwAccelStatus hw_accel_status, VideoOutputManager *manager);
void on_logo_update_required (VideoOutputManager *manager);
std::set<VideoOutputManager *> managers;
Modified: trunk/lib/engine/display/skel/display-manager.h
==============================================================================
--- trunk/lib/engine/display/skel/display-manager.h (original)
+++ trunk/lib/engine/display/skel/display-manager.h Mon May 12 19:12:13 2008
@@ -82,10 +82,11 @@
virtual void set_display_info (const DisplayInfo &) { };
+ sigc::signal<void, HwAccelStatus> device_opened;
+ sigc::signal<void> device_closed;
sigc::signal<void, DisplayMode> display_mode_changed;
sigc::signal<void, FSToggle> fullscreen_mode_changed;
sigc::signal<void, unsigned, unsigned> display_size_changed;
- sigc::signal<void, HwAccelStatus> hw_accel_status_changed;
sigc::signal<void> logo_update_required;
protected:
Modified: trunk/lib/engine/display/x/display-manager-x.cpp
==============================================================================
--- trunk/lib/engine/display/x/display-manager-x.cpp (original)
+++ trunk/lib/engine/display/x/display-manager-x.cpp Mon May 12 19:12:13 2008
@@ -417,13 +417,13 @@
rxWindow->ToggleOntop ();
}
- runtime.run_in_main (sigc::bind (hw_accel_status_changed.make_slot (), hw_accel_status));
+ runtime.run_in_main (sigc::bind (device_opened.make_slot (), hw_accel_status));
}
void
GMVideoOutputManager_x::close_frame_display ()
{
- runtime.run_in_main (sigc::bind (hw_accel_status_changed.make_slot (), NO_VIDEO));
+ runtime.run_in_main (device_closed.make_slot ());
if (rxWindow)
rxWindow->RegisterSlave (NULL);
Modified: trunk/lib/engine/vidinput/ptlib/vidinput-manager-ptlib.cpp
==============================================================================
--- trunk/lib/engine/vidinput/ptlib/vidinput-manager-ptlib.cpp (original)
+++ trunk/lib/engine/vidinput/ptlib/vidinput-manager-ptlib.cpp Mon May 12 19:12:13 2008
@@ -111,22 +111,22 @@
pvideo_format = (PVideoDevice::VideoFormat)current_state.format;
input_device = PVideoInputDevice::CreateOpenedDevice (current_state.device.source, current_state.device.device, FALSE);
- Ekiga::VidInputErrorCodes error_code = Ekiga::ERR_NONE;
+ Ekiga::VideoInputErrorCodes error_code = Ekiga::VI_ERROR_NONE;
if (!input_device)
- error_code = Ekiga::ERR_DEVICE;
+ error_code = Ekiga::VI_ERROR_DEVICE;
else if (!input_device->SetVideoFormat (pvideo_format))
- error_code = Ekiga::ERR_FORMAT;
+ error_code = Ekiga::VI_ERROR_FORMAT;
else if (!input_device->SetChannel (current_state.channel))
- error_code = Ekiga::ERR_CHANNEL;
+ error_code = Ekiga::VI_ERROR_CHANNEL;
else if (!input_device->SetColourFormatConverter ("YUV420P"))
- error_code = Ekiga::ERR_COLOUR;
+ error_code = Ekiga::VI_ERROR_COLOUR;
else if (!input_device->SetFrameRate (current_state.fps))
- error_code = Ekiga::ERR_FPS;
+ error_code = Ekiga::VI_ERROR_FPS;
else if (!input_device->SetFrameSizeConverter (current_state.width, current_state.height, PVideoFrameInfo::eScale))
- error_code = Ekiga::ERR_SCALE;
+ error_code = Ekiga::VI_ERROR_SCALE;
else input_device->Start ();
- if (error_code != Ekiga::ERR_NONE) {
+ if (error_code != Ekiga::VI_ERROR_NONE) {
PTRACE(1, "GMVideoInputManager_ptlib\tEncountered error " << error_code << " while opening device ");
runtime.run_in_main (sigc::bind (device_error.make_slot (), current_state.device, error_code));
return false;
Modified: trunk/lib/engine/vidinput/skel/vidinput-core.cpp
==============================================================================
--- trunk/lib/engine/vidinput/skel/vidinput-core.cpp (original)
+++ trunk/lib/engine/vidinput/skel/vidinput-core.cpp Mon May 12 19:12:13 2008
@@ -173,9 +173,9 @@
managers.insert (&manager);
manager_added.emit (manager);
- manager.device_error.connect (sigc::bind (sigc::mem_fun (this, &VidInputCore::on_vidinputdevice_error), &manager));
- manager.device_opened.connect (sigc::bind (sigc::mem_fun (this, &VidInputCore::on_vidinputdevice_opened), &manager));
- manager.device_closed.connect (sigc::bind (sigc::mem_fun (this, &VidInputCore::on_vidinputdevice_closed), &manager));
+ manager.device_opened.connect (sigc::bind (sigc::mem_fun (this, &VidInputCore::on_device_opened), &manager));
+ manager.device_closed.connect (sigc::bind (sigc::mem_fun (this, &VidInputCore::on_device_closed), &manager));
+ manager.device_error.connect (sigc::bind (sigc::mem_fun (this, &VidInputCore::on_device_error), &manager));
}
@@ -453,21 +453,21 @@
new_stream_settings.contrast = contrast ;
}
-void VidInputCore::on_vidinputdevice_error (VidInputDevice vidinput_device, VidInputErrorCodes error_code, VideoInputManager *manager)
+void VidInputCore::on_device_opened (VidInputDevice device,
+ VidInputConfig vidinput_config,
+ VideoInputManager *manager)
{
- vidinputdevice_error.emit (*manager, vidinput_device, error_code);
+ device_opened.emit (*manager, device, vidinput_config);
}
-void VidInputCore::on_vidinputdevice_opened (VidInputDevice vidinput_device,
- VidInputConfig vidinput_config,
- VideoInputManager *manager)
+void VidInputCore::on_device_closed (VidInputDevice device, VideoInputManager *manager)
{
- vidinputdevice_opened.emit (*manager, vidinput_device, vidinput_config);
+ device_closed.emit (*manager, device);
}
-void VidInputCore::on_vidinputdevice_closed (VidInputDevice vidinput_device, VideoInputManager *manager)
+void VidInputCore::on_device_error (VidInputDevice device, VideoInputErrorCodes error_code, VideoInputManager *manager)
{
- vidinputdevice_closed.emit (*manager, vidinput_device);
+ device_error.emit (*manager, device, error_code);
}
void VidInputCore::internal_set_vidinput_device(const VidInputDevice & vidinput_device, int channel, VideoFormat format)
@@ -563,7 +563,7 @@
internal_set_vidinput_device(vidinput_device, current_channel, current_format);
}
- runtime.run_in_main (sigc::bind (vidinputdevice_added.make_slot (), vidinput_device));
+ runtime.run_in_main (sigc::bind (device_added.make_slot (), vidinput_device));
}
}
}
@@ -589,7 +589,7 @@
internal_set_vidinput_device(new_vidinput_device, current_channel, current_format);
}
- runtime.run_in_main (sigc::bind (vidinputdevice_removed.make_slot (), vidinput_device));
+ runtime.run_in_main (sigc::bind (device_removed.make_slot (), vidinput_device));
}
}
}
Modified: trunk/lib/engine/vidinput/skel/vidinput-core.h
==============================================================================
--- trunk/lib/engine/vidinput/skel/vidinput-core.h (original)
+++ trunk/lib/engine/vidinput/skel/vidinput-core.h Mon May 12 19:12:13 2008
@@ -183,18 +183,18 @@
/** See vidinput-manager.h for the API
*/
- sigc::signal<void, VideoInputManager &, VidInputDevice &, VidInputErrorCodes> vidinputdevice_error;
- sigc::signal<void, VidInputDevice> vidinputdevice_added;
- sigc::signal<void, VidInputDevice> vidinputdevice_removed;
- sigc::signal<void, VideoInputManager &, VidInputDevice &, VidInputConfig&> vidinputdevice_opened;
- sigc::signal<void, VideoInputManager &, VidInputDevice &> vidinputdevice_closed;
+ sigc::signal<void, VideoInputManager &, VidInputDevice &, VidInputConfig&> device_opened;
+ sigc::signal<void, VideoInputManager &, VidInputDevice &> device_closed;
+ sigc::signal<void, VideoInputManager &, VidInputDevice &, VideoInputErrorCodes> device_error;
+ sigc::signal<void, VidInputDevice> device_added;
+ sigc::signal<void, VidInputDevice> device_removed;
private:
- void on_vidinputdevice_error (VidInputDevice vidinput_device, VidInputErrorCodes error_code, VideoInputManager *manager);
- void on_vidinputdevice_opened (VidInputDevice vidinput_device,
- VidInputConfig vidinput_config,
- VideoInputManager *manager);
- void on_vidinputdevice_closed (VidInputDevice vidinput_device, VideoInputManager *manager);
+ void on_device_opened (VidInputDevice device,
+ VidInputConfig vidinput_config,
+ VideoInputManager *manager);
+ void on_device_closed (VidInputDevice device, VideoInputManager *manager);
+ void on_device_error (VidInputDevice device, VideoInputErrorCodes error_code, VideoInputManager *manager);
void internal_set_vidinput_device(const VidInputDevice & vidinput_device, int channel, VideoFormat format);
void internal_open (unsigned width, unsigned height, unsigned fps);
Modified: trunk/lib/engine/vidinput/skel/vidinput-info.h
==============================================================================
--- trunk/lib/engine/vidinput/skel/vidinput-info.h (original)
+++ trunk/lib/engine/vidinput/skel/vidinput-info.h Mon May 12 19:12:13 2008
@@ -88,14 +88,14 @@
bool modifyable;
};
- enum VidInputErrorCodes {
- ERR_NONE = 0,
- ERR_DEVICE,
- ERR_FORMAT,
- ERR_CHANNEL,
- ERR_COLOUR,
- ERR_FPS,
- ERR_SCALE
+ enum VideoInputErrorCodes {
+ VI_ERROR_NONE = 0,
+ VI_ERROR_DEVICE,
+ VI_ERROR_FORMAT,
+ VI_ERROR_CHANNEL,
+ VI_ERROR_COLOUR,
+ VI_ERROR_FPS,
+ VI_ERROR_SCALE
};
};
Modified: trunk/lib/engine/vidinput/skel/vidinput-manager.h
==============================================================================
--- trunk/lib/engine/vidinput/skel/vidinput-manager.h (original)
+++ trunk/lib/engine/vidinput/skel/vidinput-manager.h Mon May 12 19:12:13 2008
@@ -94,7 +94,7 @@
virtual bool has_device (const std::string & source, const std::string & device_name, unsigned capabilities, VidInputDevice & device) = 0;
- sigc::signal<void, VidInputDevice, VidInputErrorCodes> device_error;
+ sigc::signal<void, VidInputDevice, VideoInputErrorCodes> device_error;
sigc::signal<void, VidInputDevice, VidInputConfig> device_opened;
sigc::signal<void, VidInputDevice> device_closed;
Modified: trunk/src/gui/assistant.cpp
==============================================================================
--- trunk/src/gui/assistant.cpp (original)
+++ trunk/src/gui/assistant.cpp Mon May 12 19:12:13 2008
@@ -1287,19 +1287,19 @@
Ekiga::AudioInputCore *audioinput_core = dynamic_cast<Ekiga::AudioInputCore *> (core->get ("audioinput-core"));
Ekiga::AudioOutputCore *audiooutput_core = dynamic_cast<Ekiga::AudioOutputCore *> (core->get ("audiooutput-core"));
- conn = vidinput_core->vidinputdevice_added.connect (sigc::bind (sigc::ptr_fun (on_vidinputdevice_added_cb), assistant));
+ conn = vidinput_core->device_added.connect (sigc::bind (sigc::ptr_fun (on_vidinputdevice_added_cb), assistant));
assistant->priv->connections.push_back (conn);
- conn = vidinput_core->vidinputdevice_removed.connect (sigc::bind (sigc::ptr_fun (on_vidinputdevice_removed_cb), assistant));
+ conn = vidinput_core->device_removed.connect (sigc::bind (sigc::ptr_fun (on_vidinputdevice_removed_cb), assistant));
assistant->priv->connections.push_back (conn);
- conn = audioinput_core->audioinputdevice_added.connect (sigc::bind (sigc::ptr_fun (on_audioinputdevice_added_cb), assistant));
+ conn = audioinput_core->device_added.connect (sigc::bind (sigc::ptr_fun (on_audioinputdevice_added_cb), assistant));
assistant->priv->connections.push_back (conn);
- conn = audioinput_core->audioinputdevice_removed.connect (sigc::bind (sigc::ptr_fun (on_audioinputdevice_removed_cb), assistant));
+ conn = audioinput_core->device_removed.connect (sigc::bind (sigc::ptr_fun (on_audioinputdevice_removed_cb), assistant));
assistant->priv->connections.push_back (conn);
- conn = audiooutput_core->audiooutputdevice_added.connect (sigc::bind (sigc::ptr_fun (on_audiooutputdevice_added_cb), assistant));
+ conn = audiooutput_core->device_added.connect (sigc::bind (sigc::ptr_fun (on_audiooutputdevice_added_cb), assistant));
assistant->priv->connections.push_back (conn);
- conn = audiooutput_core->audiooutputdevice_removed.connect (sigc::bind (sigc::ptr_fun (on_audiooutputdevice_removed_cb), assistant));
+ conn = audiooutput_core->device_removed.connect (sigc::bind (sigc::ptr_fun (on_audiooutputdevice_removed_cb), assistant));
assistant->priv->connections.push_back (conn);
return GTK_WIDGET (assistant);
Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp (original)
+++ trunk/src/gui/main.cpp Mon May 12 19:12:13 2008
@@ -959,6 +959,16 @@
*/
void
+on_videooutput_device_opened_cb (Ekiga::VideoOutputManager & /* manager */, HwAccelStatus /* hw_accel_status */, gpointer /*self*/)
+{
+}
+
+void
+on_videooutput_device_closed_cb (Ekiga::VideoOutputManager & /* manager */, gpointer /*self*/)
+{
+}
+
+void
on_display_mode_changed_cb (Ekiga::VideoOutputManager & /* manager */, DisplayMode display, gpointer self)
{
GmMainWindow *mw = gm_mw_get_mw (GTK_WIDGET (self));
@@ -990,16 +1000,11 @@
gtk_window_resize (GTK_WINDOW (self), width + 20, mw->y ? mw->y : (int) height * 2.5);
}
-void
-on_hw_accel_status_changed_cb (Ekiga::VideoOutputManager & /* manager */, HwAccelStatus /* hw_accel_status */, gpointer /*self*/)
-{
-}
-
void
-on_vidinputdevice_opened_cb (Ekiga::VideoInputManager & /* manager */,
- Ekiga::VidInputDevice & /* vidinput_device */,
- Ekiga::VidInputConfig & vidinput_config,
- gpointer self)
+on_videoinput_device_opened_cb (Ekiga::VideoInputManager & /* manager */,
+ Ekiga::VidInputDevice & /* device */,
+ Ekiga::VidInputConfig & config,
+ gpointer self)
{
gm_main_window_update_sensitivity (GTK_WIDGET (self), TRUE, FALSE, TRUE);
@@ -1008,11 +1013,11 @@
mw = gm_mw_get_mw (GTK_WIDGET (self));
g_return_if_fail (mw != NULL);
- gtk_widget_set_sensitive (GTK_WIDGET (mw->video_settings_frame), vidinput_config.modifyable ? TRUE : FALSE);
- GTK_ADJUSTMENT (mw->adj_whiteness)->value = vidinput_config.whiteness;
- GTK_ADJUSTMENT (mw->adj_brightness)->value = vidinput_config.brightness;
- GTK_ADJUSTMENT (mw->adj_colour)->value = vidinput_config.colour;
- GTK_ADJUSTMENT (mw->adj_contrast)->value = vidinput_config.contrast;
+ gtk_widget_set_sensitive (GTK_WIDGET (mw->video_settings_frame), config.modifyable ? TRUE : FALSE);
+ GTK_ADJUSTMENT (mw->adj_whiteness)->value = config.whiteness;
+ GTK_ADJUSTMENT (mw->adj_brightness)->value = config.brightness;
+ GTK_ADJUSTMENT (mw->adj_colour)->value = config.colour;
+ GTK_ADJUSTMENT (mw->adj_contrast)->value = config.contrast;
gtk_widget_queue_draw (GTK_WIDGET (mw->video_settings_frame));
}
@@ -1020,7 +1025,7 @@
void
-on_vidinputdevice_closed_cb (Ekiga::VideoInputManager & /* manager */, Ekiga::VidInputDevice & /*vidinput_device*/, gpointer self)
+on_videoinput_device_closed_cb (Ekiga::VideoInputManager & /* manager */, Ekiga::VidInputDevice & /*device*/, gpointer self)
{
GmMainWindow *mw = NULL;
g_return_if_fail (self != NULL);
@@ -1034,10 +1039,10 @@
}
void
-on_vidinputdevice_error_cb (Ekiga::VideoInputManager & /* manager */,
- Ekiga::VidInputDevice & vidinput_device,
- Ekiga::VidInputErrorCodes error_code,
- gpointer self)
+on_videoinput_device_error_cb (Ekiga::VideoInputManager & /* manager */,
+ Ekiga::VidInputDevice & device,
+ Ekiga::VideoInputErrorCodes error_code,
+ gpointer self)
{
gchar *dialog_title = NULL;
gchar *dialog_msg = NULL;
@@ -1045,36 +1050,36 @@
dialog_title =
g_strdup_printf (_("Error while accessing video device %s"),
- (const char *) vidinput_device.device.c_str());
+ (const char *) device.device.c_str());
tmp_msg = g_strdup (_("A moving logo will be transmitted during calls. Notice that you can always transmit a given image or the moving logo by choosing \"Picture\" as video plugin and \"Moving logo\" or \"Static picture\" as device."));
switch (error_code) {
- case Ekiga::ERR_DEVICE:
+ case Ekiga::VI_ERROR_DEVICE:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("There was an error while opening the device. In case it is a pluggable device it may be sufficient to reconnect it. If not, or if it still is not accessible, please check your permissions and make sure that the appropriate driver is loaded."), NULL);
break;
- case Ekiga::ERR_FORMAT:
+ case Ekiga::VI_ERROR_FORMAT:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("Your video driver doesn't support the requested video format."), NULL);
break;
- case Ekiga::ERR_CHANNEL:
+ case Ekiga::VI_ERROR_CHANNEL:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("Could not open the chosen channel."), NULL);
break;
- case Ekiga::ERR_COLOUR:
+ case Ekiga::VI_ERROR_COLOUR:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("Your driver doesn't seem to support any of the color formats supported by Ekiga.\n Please check your kernel driver documentation in order to determine which Palette is supported."), NULL);
break;
- case Ekiga::ERR_FPS:
+ case Ekiga::VI_ERROR_FPS:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("Error while setting the frame rate."), NULL);
break;
- case Ekiga::ERR_SCALE:
+ case Ekiga::VI_ERROR_SCALE:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("Error while setting the frame size."), NULL);
break;
- case Ekiga::ERR_NONE:
+ case Ekiga::VI_ERROR_NONE:
default:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("Unknown error."), NULL);
break;
@@ -1090,18 +1095,18 @@
}
void
-on_audioinputdevice_opened_cb (Ekiga::AudioInputManager & /* manager */,
- Ekiga::AudioInputDevice & /* audioinput_device */,
- Ekiga::AudioInputConfig & audioinput_config,
- gpointer self)
+on_audioinput_device_opened_cb (Ekiga::AudioInputManager & /* manager */,
+ Ekiga::AudioInputDevice & /* device */,
+ Ekiga::AudioInputConfig & config,
+ gpointer self)
{
GmMainWindow *mw = NULL;
g_return_if_fail (self != NULL);
mw = gm_mw_get_mw (GTK_WIDGET (self));
g_return_if_fail (mw != NULL);
- gtk_widget_set_sensitive (GTK_WIDGET (mw->audio_input_volume_frame), audioinput_config.modifyable ? TRUE : FALSE);
- GTK_ADJUSTMENT (mw->adj_input_volume)->value = audioinput_config.volume;
+ gtk_widget_set_sensitive (GTK_WIDGET (mw->audio_input_volume_frame), config.modifyable ? TRUE : FALSE);
+ GTK_ADJUSTMENT (mw->adj_input_volume)->value = config.volume;
gtk_widget_queue_draw (GTK_WIDGET (mw->audio_input_volume_frame));
}
@@ -1109,9 +1114,9 @@
void
-on_audioinputdevice_closed_cb (Ekiga::AudioInputManager & /* manager */,
- Ekiga::AudioInputDevice & /*audioinput_device*/,
- gpointer self)
+on_audioinput_device_closed_cb (Ekiga::AudioInputManager & /* manager */,
+ Ekiga::AudioInputDevice & /*device*/,
+ gpointer self)
{
GmMainWindow *mw = NULL;
g_return_if_fail (self != NULL);
@@ -1122,10 +1127,10 @@
}
void
-on_audioinputdevice_error_cb (Ekiga::AudioInputManager & /* manager */,
- Ekiga::AudioInputDevice & audioinput_device,
- Ekiga::AudioInputErrorCodes error_code,
- gpointer self)
+on_audioinput_device_error_cb (Ekiga::AudioInputManager & /* manager */,
+ Ekiga::AudioInputDevice & device,
+ Ekiga::AudioInputErrorCodes error_code,
+ gpointer self)
{
gchar *dialog_title = NULL;
gchar *dialog_msg = NULL;
@@ -1133,20 +1138,20 @@
dialog_title =
g_strdup_printf (_("Error while opening audio input device %s"),
- (const char *) audioinput_device.device.c_str());
+ (const char *) device.device.c_str());
tmp_msg = g_strdup (_("Only silence will be transmitted."));
switch (error_code) {
- case Ekiga::AUDIO_ERR_DEVICE:
+ case Ekiga::AI_ERROR_DEVICE:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("Unable to open the selected audio device for recording. In case it is a pluggable device it may be sufficient to reconnect it. If not, or if it still is not accessible, please check your audio setup, the permissions and that the device is not busy."), NULL);
break;
- case Ekiga::AUDIO_ERR_READ:
+ case Ekiga::AI_ERROR_READ:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("The selected audio device was successfully opened but it is impossible to read data from this device. In case it is a pluggable device it may be sufficient to reconnect it. If not, or if it still is not accessible, please check your audio setup."), NULL);
break;
- case Ekiga::ERR_NONE:
+ case Ekiga::AI_ERROR_NONE:
default:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("Unknown error."), NULL);
break;
@@ -1163,11 +1168,11 @@
}
void
-on_audiooutputdevice_opened_cb (Ekiga::AudioOutputManager & /*manager*/,
- Ekiga::AudioOutputPrimarySecondary primarySecondary,
- Ekiga::AudioOutputDevice & /*audiooutput_device*/,
- Ekiga::AudioOutputConfig & audiooutput_config,
- gpointer self)
+on_audiooutput_device_opened_cb (Ekiga::AudioOutputManager & /*manager*/,
+ Ekiga::AudioOutputPrimarySecondary primarySecondary,
+ Ekiga::AudioOutputDevice & /*device*/,
+ Ekiga::AudioOutputConfig & config,
+ gpointer self)
{
if (primarySecondary == Ekiga::secondary)
return;
@@ -1177,8 +1182,8 @@
mw = gm_mw_get_mw (GTK_WIDGET (self));
g_return_if_fail (mw != NULL);
- gtk_widget_set_sensitive (GTK_WIDGET (mw->audio_output_volume_frame), audiooutput_config.modifyable ? TRUE : FALSE);
- GTK_ADJUSTMENT (mw->adj_output_volume)->value = audiooutput_config.volume;
+ gtk_widget_set_sensitive (GTK_WIDGET (mw->audio_output_volume_frame), config.modifyable ? TRUE : FALSE);
+ GTK_ADJUSTMENT (mw->adj_output_volume)->value = config.volume;
gtk_widget_queue_draw (GTK_WIDGET (mw->audio_output_volume_frame));
}
@@ -1186,10 +1191,10 @@
void
-on_audiooutputdevice_closed_cb (Ekiga::AudioOutputManager & /*manager*/,
- Ekiga::AudioOutputPrimarySecondary primarySecondary,
- Ekiga::AudioOutputDevice & /*audiooutput_device*/,
- gpointer self)
+on_audiooutput_device_closed_cb (Ekiga::AudioOutputManager & /*manager*/,
+ Ekiga::AudioOutputPrimarySecondary primarySecondary,
+ Ekiga::AudioOutputDevice & /*device*/,
+ gpointer self)
{
if (primarySecondary == Ekiga::secondary)
return;
@@ -1203,11 +1208,11 @@
}
void
-on_audiooutputdevice_error_cb (Ekiga::AudioOutputManager & /*manager */,
- Ekiga::AudioOutputPrimarySecondary primarySecondary,
- Ekiga::AudioOutputDevice & audiooutput_device,
- Ekiga::AudioOutputErrorCodes error_code,
- gpointer self)
+on_audiooutput_device_error_cb (Ekiga::AudioOutputManager & /*manager */,
+ Ekiga::AudioOutputPrimarySecondary primarySecondary,
+ Ekiga::AudioOutputDevice & device,
+ Ekiga::AudioOutputErrorCodes error_code,
+ gpointer self)
{
if (primarySecondary == Ekiga::secondary)
return;
@@ -1218,20 +1223,20 @@
dialog_title =
g_strdup_printf (_("Error while opening audio output device %s"),
- (const char *) audiooutput_device.device.c_str());
+ (const char *) device.device.c_str());
tmp_msg = g_strdup (_("No incoming sound will be played."));
switch (error_code) {
- case Ekiga::_AUDIO_ERR_DEVICE:
+ case Ekiga::AO_ERROR_DEVICE:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("Unable to open the selected audio device for playing. In case it is a pluggable device it may be sufficient to reconnect it. If not, or if it still is not accessible, please check your audio setup, the permissions and that the device is not busy."), NULL);
break;
- case Ekiga::_AUDIO_ERR_WRITE:
+ case Ekiga::AO_ERROR_WRITE:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("The selected audio device was successfully opened but it is impossible to write data from this device. In case it is a pluggable device it may be sufficient to reconnect it. If not, or if it still is not accessible, please check your audio setup."), NULL);
break;
- case Ekiga::_AUDIO_ERR_NONE:
+ case Ekiga::AO_ERROR_NONE:
default:
dialog_msg = g_strconcat (tmp_msg, "\n\n", _("Unknown error."), NULL);
break;
@@ -3873,6 +3878,12 @@
/* New Display Engine signals */
Ekiga::DisplayCore *display_core = dynamic_cast<Ekiga::DisplayCore *> (mw->core.get ("display-core"));
+ conn = display_core->device_opened.connect (sigc::bind (sigc::ptr_fun (on_videooutput_device_opened_cb), (gpointer) window));
+ mw->connections.push_back (conn);
+
+ conn = display_core->device_closed.connect (sigc::bind (sigc::ptr_fun (on_videooutput_device_closed_cb), (gpointer) window));
+ mw->connections.push_back (conn);
+
conn = display_core->logo_update_required.connect (sigc::bind (sigc::ptr_fun (on_logo_update_required_cb), (gpointer) window));
mw->connections.push_back (conn);
@@ -3885,43 +3896,40 @@
conn = display_core->fullscreen_mode_changed.connect (sigc::bind (sigc::ptr_fun (on_fullscreen_mode_changed_cb), (gpointer) window));
mw->connections.push_back (conn);
- conn = display_core->hw_accel_status_changed.connect (sigc::bind (sigc::ptr_fun (on_hw_accel_status_changed_cb), (gpointer) window));
- mw->connections.push_back (conn);
-
/* New VidInput Engine signals */
Ekiga::VidInputCore *vidinput_core = dynamic_cast<Ekiga::VidInputCore *> (mw->core.get ("vidinput-core"));
- conn = vidinput_core->vidinputdevice_opened.connect (sigc::bind (sigc::ptr_fun (on_vidinputdevice_opened_cb), (gpointer) window));
+ conn = vidinput_core->device_opened.connect (sigc::bind (sigc::ptr_fun (on_videoinput_device_opened_cb), (gpointer) window));
mw->connections.push_back (conn);
- conn = vidinput_core->vidinputdevice_closed.connect (sigc::bind (sigc::ptr_fun (on_vidinputdevice_closed_cb), (gpointer) window));
+ conn = vidinput_core->device_closed.connect (sigc::bind (sigc::ptr_fun (on_videoinput_device_closed_cb), (gpointer) window));
mw->connections.push_back (conn);
- conn = vidinput_core->vidinputdevice_error.connect (sigc::bind (sigc::ptr_fun (on_vidinputdevice_error_cb), (gpointer) window));
+ conn = vidinput_core->device_error.connect (sigc::bind (sigc::ptr_fun (on_videoinput_device_error_cb), (gpointer) window));
mw->connections.push_back (conn);
/* New AudioInput Engine signals */
Ekiga::AudioInputCore *audioinput_core = dynamic_cast<Ekiga::AudioInputCore *> (mw->core.get ("audioinput-core"));
- conn = audioinput_core->audioinputdevice_opened.connect (sigc::bind (sigc::ptr_fun (on_audioinputdevice_opened_cb), (gpointer) window));
+ conn = audioinput_core->device_opened.connect (sigc::bind (sigc::ptr_fun (on_audioinput_device_opened_cb), (gpointer) window));
mw->connections.push_back (conn);
- conn = audioinput_core->audioinputdevice_closed.connect (sigc::bind (sigc::ptr_fun (on_audioinputdevice_closed_cb), (gpointer) window));
+ conn = audioinput_core->device_closed.connect (sigc::bind (sigc::ptr_fun (on_audioinput_device_closed_cb), (gpointer) window));
mw->connections.push_back (conn);
- conn = audioinput_core->audioinputdevice_error.connect (sigc::bind (sigc::ptr_fun (on_audioinputdevice_error_cb), (gpointer) window));
+ conn = audioinput_core->device_error.connect (sigc::bind (sigc::ptr_fun (on_audioinput_device_error_cb), (gpointer) window));
mw->connections.push_back (conn);
/* New AudioOutput Engine signals */
Ekiga::AudioOutputCore *audiooutput_core = dynamic_cast<Ekiga::AudioOutputCore *> (mw->core.get ("audiooutput-core"));
- conn = audiooutput_core->audiooutputdevice_opened.connect (sigc::bind (sigc::ptr_fun (on_audiooutputdevice_opened_cb), (gpointer) window));
+ conn = audiooutput_core->device_opened.connect (sigc::bind (sigc::ptr_fun (on_audiooutput_device_opened_cb), (gpointer) window));
mw->connections.push_back (conn);
- conn = audiooutput_core->audiooutputdevice_closed.connect (sigc::bind (sigc::ptr_fun (on_audiooutputdevice_closed_cb), (gpointer) window));
+ conn = audiooutput_core->device_closed.connect (sigc::bind (sigc::ptr_fun (on_audiooutput_device_closed_cb), (gpointer) window));
mw->connections.push_back (conn);
- conn = audiooutput_core->audiooutputdevice_error.connect (sigc::bind (sigc::ptr_fun (on_audiooutputdevice_error_cb), (gpointer) window));
+ conn = audiooutput_core->device_error.connect (sigc::bind (sigc::ptr_fun (on_audiooutput_device_error_cb), (gpointer) window));
mw->connections.push_back (conn);
/* New Call Engine signals */
Modified: trunk/src/gui/preferences.cpp
==============================================================================
--- trunk/src/gui/preferences.cpp (original)
+++ trunk/src/gui/preferences.cpp Mon May 12 19:12:13 2008
@@ -1622,19 +1622,19 @@
Ekiga::AudioInputCore *audioinput_core = dynamic_cast<Ekiga::AudioInputCore *> (core->get ("audioinput-core"));
Ekiga::AudioOutputCore *audiooutput_core = dynamic_cast<Ekiga::AudioOutputCore *> (core->get ("audiooutput-core"));
- conn = vidinput_core->vidinputdevice_added.connect (sigc::bind (sigc::ptr_fun (on_vidinputdevice_added_cb), window));
+ conn = vidinput_core->device_added.connect (sigc::bind (sigc::ptr_fun (on_vidinputdevice_added_cb), window));
pw->connections.push_back (conn);
- conn = vidinput_core->vidinputdevice_removed.connect (sigc::bind (sigc::ptr_fun (on_vidinputdevice_removed_cb), window));
+ conn = vidinput_core->device_removed.connect (sigc::bind (sigc::ptr_fun (on_vidinputdevice_removed_cb), window));
pw->connections.push_back (conn);
- conn = audioinput_core->audioinputdevice_added.connect (sigc::bind (sigc::ptr_fun (on_audioinputdevice_added_cb), window));
+ conn = audioinput_core->device_added.connect (sigc::bind (sigc::ptr_fun (on_audioinputdevice_added_cb), window));
pw->connections.push_back (conn);
- conn = audioinput_core->audioinputdevice_removed.connect (sigc::bind (sigc::ptr_fun (on_audioinputdevice_removed_cb), window));
+ conn = audioinput_core->device_removed.connect (sigc::bind (sigc::ptr_fun (on_audioinputdevice_removed_cb), window));
pw->connections.push_back (conn);
- conn = audiooutput_core->audiooutputdevice_added.connect (sigc::bind (sigc::ptr_fun (on_audiooutputdevice_added_cb), window));
- pw->connections.push_back (conn);
- conn = audiooutput_core->audiooutputdevice_removed.connect (sigc::bind (sigc::ptr_fun (on_audiooutputdevice_removed_cb), window));
+ conn = audiooutput_core->device_added.connect (sigc::bind (sigc::ptr_fun (on_audiooutputdevice_added_cb), window));
+ pw->connections.push_back(conn);
+ conn = audiooutput_core->device_removed.connect (sigc::bind (sigc::ptr_fun (on_audiooutputdevice_removed_cb), window));
pw->connections.push_back (conn);
return window;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
