[ekiga] Remove unused variable
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Remove unused variable
- Date: Tue, 18 Dec 2012 22:23:38 +0000 (UTC)
commit b4adb26c1481c9511f22581dfd3720ab9637d160
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Tue Dec 18 23:23:21 2012 +0100
Remove unused variable
lib/engine/gui/gtk-frontend/call-window.cpp | 1 -
lib/engine/videooutput/videooutput-info.h | 29 ++++++++++++--------------
2 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index 2fdec52..ae23e85 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -2607,7 +2607,6 @@ ekiga_call_window_expose_event (GtkWidget *widget,
}
display_info.gc = GDK_GC_XGC (cw->priv->video_widget_gc);
- display_info.xdisplay = GDK_GC_XDISPLAY (cw->priv->video_widget_gc);
display_info.window = GDK_WINDOW_XWINDOW (video_widget->window);
g_return_val_if_fail (display_info.window != 0, handled);
diff --git a/lib/engine/videooutput/videooutput-info.h b/lib/engine/videooutput/videooutput-info.h
index 1d2f94b..92ff09e 100644
--- a/lib/engine/videooutput/videooutput-info.h
+++ b/lib/engine/videooutput/videooutput-info.h
@@ -27,7 +27,7 @@
/*
* videooutput-info.h - description
* ------------------------------------------
- * begin : written in 2007 by Matthias Schneider
+ * begin : written in 2007 by Matthias Schneider
* copyright : (c) 2007 by Matthias Schneider
* description : Declaration of structs and classes used for communication
* with the VideoOutputManagers
@@ -70,12 +70,12 @@ namespace Ekiga {
/* Toggle operations for Fullscreen */
typedef enum {
-
+
VO_FS_ON,
VO_FS_OFF,
VO_FS_TOGGLE
} VideoOutputFSToggle;
-
+
/* Video Acceleration Status */
typedef enum {
@@ -113,21 +113,20 @@ namespace Ekiga {
#else
gc = 0;
window = 0;
- xdisplay = NULL;
#endif
-
+
config_info_set = false;
on_top = false;
disable_hw_accel = false;
allow_pip_sw_scaling = true;
sw_scaling_algorithm = 0;
-
+
mode = VO_MODE_UNSET;
zoom = 0;
};
-
+
void operator= ( const DisplayInfo& rhs) {
-
+
if (rhs.widget_info_set) {
widget_info_set = rhs.widget_info_set;
x = rhs.x;
@@ -137,39 +136,37 @@ namespace Ekiga {
#else
gc = rhs.gc;
window = rhs.window;
- xdisplay = rhs.xdisplay;
#endif
}
-
+
if (rhs.config_info_set) {
config_info_set = rhs.config_info_set;
on_top = rhs.on_top;
disable_hw_accel = rhs.disable_hw_accel;
allow_pip_sw_scaling = rhs.allow_pip_sw_scaling;
- sw_scaling_algorithm = rhs.sw_scaling_algorithm;
+ sw_scaling_algorithm = rhs.sw_scaling_algorithm;
}
if (rhs.mode != VO_MODE_UNSET) mode = rhs.mode;
if (rhs.zoom != 0) zoom = rhs.zoom;
};
-
+
bool widget_info_set;
int x;
int y;
-
+
#ifdef WIN32
HWND hwnd;
#else
GC gc;
Window window;
- Display* xdisplay;
#endif
-
+
bool config_info_set;
bool on_top;
bool disable_hw_accel;
bool allow_pip_sw_scaling;
unsigned int sw_scaling_algorithm;
-
+
VideoOutputMode mode;
unsigned int zoom;
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]