/pidgin/main: 1ed332c1975d: Rearrange things slightly.
Elliott Sales de Andrade
qulogic at pidgin.im
Mon Nov 5 18:15:59 EST 2012
Changeset: 1ed332c1975d7bf6d71a06b663e2027099dd8040
Author: Elliott Sales de Andrade <qulogic at pidgin.im>
Date: 2012-09-15 01:17 -0400
Branch: default
URL: http://hg.pidgin.im/pidgin/main/rev/1ed332c1975d
Description:
Rearrange things slightly.
diffstat:
pidgin/gtkprefs.c | 104 ++++++++++++++++++++++++++++-------------------------
1 files changed, 54 insertions(+), 50 deletions(-)
diffs (121 lines):
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -112,6 +112,60 @@ static GtkListStore *prefs_conv_variants
static GtkListStore *prefs_status_icon_themes;
static GtkListStore *prefs_smiley_themes;
+#if USE_VV
+
+static const gchar *AUDIO_SRC_PLUGINS[] = {
+ "alsasrc", "ALSA",
+ /* "esdmon", "ESD", ? */
+ "osssrc", "OSS",
+ "pulsesrc", "PulseAudio",
+ "sndiosrc", "sndio",
+ /* "audiotestsrc wave=silence", "Silence", */
+ "audiotestsrc", "Test Sound",
+ NULL
+};
+
+static const gchar *AUDIO_SINK_PLUGINS[] = {
+ "alsasink", "ALSA",
+ "artsdsink", "aRts",
+ "esdsink", "ESD",
+ "osssink", "OSS",
+ "pulsesink", "PulseAudio",
+ "sndiosink", "sndio",
+ NULL
+};
+
+static const gchar *VIDEO_SRC_PLUGINS[] = {
+ "videotestsrc", "Test Input",
+ "dshowvideosrc","DirectDraw",
+ "ksvideosrc", "KS Video",
+ "qcamsrc", "Quickcam",
+ "v4lsrc", "Video4Linux",
+ "v4l2src", "Video4Linux2",
+ "v4lmjpegsrc", "Video4Linux MJPEG",
+ NULL
+};
+
+static const gchar *VIDEO_SINK_PLUGINS[] = {
+ /* "aasink", "AALib", Didn't work for me */
+ "directdrawsink","DirectDraw",
+ "glimagesink", "OpenGL",
+ "ximagesink", "X Window System",
+ "xvimagesink", "X Window System (Xv)",
+ NULL
+};
+
+typedef struct {
+ GtkWidget *level;
+ GtkWidget *threshold;
+ GtkWidget *volume;
+} BusCbCtx;
+
+static GstElement *voice_pipeline;
+static GstElement *video_pipeline;
+
+#endif
+
/*
* PROTOTYPES
*/
@@ -2947,56 +3001,6 @@ away_page(void)
}
#if USE_VV
-static const gchar *AUDIO_SRC_PLUGINS[] = {
- "alsasrc", "ALSA",
- /* "esdmon", "ESD", ? */
- "osssrc", "OSS",
- "pulsesrc", "PulseAudio",
- "sndiosrc", "sndio",
- /* "audiotestsrc wave=silence", "Silence", */
- "audiotestsrc", "Test Sound",
- NULL
-};
-
-static const gchar *AUDIO_SINK_PLUGINS[] = {
- "alsasink", "ALSA",
- "artsdsink", "aRts",
- "esdsink", "ESD",
- "osssink", "OSS",
- "pulsesink", "PulseAudio",
- "sndiosink", "sndio",
- NULL
-};
-
-static const gchar *VIDEO_SRC_PLUGINS[] = {
- "videotestsrc", "Test Input",
- "dshowvideosrc","DirectDraw",
- "ksvideosrc", "KS Video",
- "qcamsrc", "Quickcam",
- "v4lsrc", "Video4Linux",
- "v4l2src", "Video4Linux2",
- "v4lmjpegsrc", "Video4Linux MJPEG",
- NULL
-};
-
-static const gchar *VIDEO_SINK_PLUGINS[] = {
- /* "aasink", "AALib", Didn't work for me */
- "directdrawsink","DirectDraw",
- "glimagesink", "OpenGL",
- "ximagesink", "X Window System",
- "xvimagesink", "X Window System (Xv)",
- NULL
-};
-
-typedef struct {
- GtkWidget *level;
- GtkWidget *threshold;
- GtkWidget *volume;
-} BusCbCtx;
-
-static GstElement *voice_pipeline;
-static GstElement *video_pipeline;
-
static GList *
get_vv_element_devices(const gchar *element_name)
{
More information about the Commits
mailing list