Mercurial > pidgin
diff pidgin/gtksound.c @ 19672:0914ce0f3e0e
Don't assume that the Gstreamer stuff isn't used on win32. There really isn't anything to see here.
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Thu, 06 Sep 2007 15:42:57 +0000 |
parents | 3d42c005fc17 |
children | 44b4e8bd759b |
line wrap: on
line diff
--- a/pidgin/gtksound.c Thu Sep 06 15:40:57 2007 +0000 +++ b/pidgin/gtksound.c Thu Sep 06 15:42:57 2007 +0000 @@ -446,6 +446,8 @@ g_free(command); return; } +#endif /* _WIN32 */ + #ifdef USE_GSTREAMER if (gst_init_failed) /* Perhaps do gdk_beep instead? */ return; @@ -460,7 +462,9 @@ purple_debug_error("sound", "Unable to create GStreamer audiosink.\n"); return; } - } else if (!strcmp(method, "esd")) { + } +#ifndef _WIN32 + else if (!strcmp(method, "esd")) { sink = gst_element_factory_make("esdsink", "sink"); if (!sink) { purple_debug_error("sound", "Unable to create GStreamer audiosink.\n"); @@ -472,7 +476,9 @@ purple_debug_error("sound", "Unable to create GStreamer audiosink.\n"); return; } - } else { + } +#endif + else { purple_debug_error("sound", "Unknown sound method '%s'\n", method); return; } @@ -498,9 +504,9 @@ g_free(uri); #else /* USE_GSTREAMER */ + +#ifndef _WIN32 gdk_beep(); - return; -#endif /* USE_GSTREAMER */ #else /* _WIN32 */ purple_debug_info("sound", "Playing %s\n", filename); @@ -518,6 +524,8 @@ g_free(l_filename); } #endif /* _WIN32 */ + +#endif /* USE_GSTREAMER */ } static void