From c9a2adc0e403fec77a72cdccc535a3588cc25b32 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 21 Jun 2006 00:03:25 +0000 Subject: s/pulse/polyp git-svn-id: file:///home/lennart/svn/public/padevchooser/trunk@4 e4aeda27-4315-0410-ac56-b21855d76123 --- src/Makefile | 4 ++-- src/padevchooser.c | 32 ++++++++++++++++---------------- src/padevchooser.glade | 2 +- src/x11prop.c | 8 ++++---- src/x11prop.h | 8 ++++---- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Makefile b/src/Makefile index 82d6ead..847e2b5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ -CFLAGS=-Wextra -Wall -g -O0 -pipe `pkg-config --cflags gtk+-2.0 polyplib polyplib-browse polyplib-glib-mainloop libnotify libglade-2.0 gconf-2.0` -I. -DEGG_COMPILATION -LIBS=`pkg-config --libs gtk+-2.0 polyplib polyplib-browse polyplib-glib-mainloop libnotify libglade-2.0 gconf-2.0` +CFLAGS=-Wextra -Wall -g -O0 -pipe `pkg-config --cflags gtk+-2.0 libpulse libpulse-browse libpulse-mainloop-glib libnotify libglade-2.0 gconf-2.0` -I. -DEGG_COMPILATION +LIBS=`pkg-config --libs gtk+-2.0 libpulse libpulse-browse libpulse-mainloop-glib libnotify libglade-2.0 gconf-2.0` padevchooser: eggtrayicon.o padevchooser.o x11prop.o $(CC) -o $@ $^ $(LIBS) diff --git a/src/padevchooser.c b/src/padevchooser.c index 09f7c97..8143934 100644 --- a/src/padevchooser.c +++ b/src/padevchooser.c @@ -5,9 +5,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "eggtrayicon.h" #include "x11prop.h" @@ -487,7 +487,7 @@ static EggTrayIcon *create_tray_icon(void) { EggTrayIcon *tray_icon; GtkWidget *event_box, *icon; - tray_icon = egg_tray_icon_new("Polypaudio Device Chooser"); + tray_icon = egg_tray_icon_new("PulseAudio Device Chooser"); event_box = gtk_event_box_new(); g_signal_connect_swapped(G_OBJECT(event_box), "button-press-event", G_CALLBACK(tray_icon_on_click), NULL); @@ -499,7 +499,7 @@ static EggTrayIcon *create_tray_icon(void) { gtk_widget_show_all(GTK_WIDGET(tray_icon)); tips = gtk_tooltips_new(); - gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), event_box, "Polypaudio Applet", "I don't know what this is."); + gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), event_box, "PulseAudio Applet", "I don't know what this is."); return tray_icon; } @@ -600,33 +600,33 @@ static void get_x11_props(void) { g_free(current_sink); g_free(current_source); - current_server = g_strdup(x11_get_prop(GDK_DISPLAY(), "POLYP_SERVER", t, sizeof(t))); - current_sink = g_strdup(x11_get_prop(GDK_DISPLAY(), "POLYP_SINK", t, sizeof(t))); - current_source = g_strdup(x11_get_prop(GDK_DISPLAY(), "POLYP_SOURCE", t, sizeof(t))); + current_server = g_strdup(x11_get_prop(GDK_DISPLAY(), "PULSE_SERVER", t, sizeof(t))); + current_sink = g_strdup(x11_get_prop(GDK_DISPLAY(), "PULSE_SINK", t, sizeof(t))); + current_source = g_strdup(x11_get_prop(GDK_DISPLAY(), "PULSE_SOURCE", t, sizeof(t))); } static void set_x11_props(void) { if (current_server) - x11_set_prop(GDK_DISPLAY(), "POLYP_SERVER", current_server); + x11_set_prop(GDK_DISPLAY(), "PULSE_SERVER", current_server); else - x11_del_prop(GDK_DISPLAY(), "POLYP_SERVER"); + x11_del_prop(GDK_DISPLAY(), "PULSE_SERVER"); if (current_sink) - x11_set_prop(GDK_DISPLAY(), "POLYP_SINK", current_sink); + x11_set_prop(GDK_DISPLAY(), "PULSE_SINK", current_sink); else - x11_del_prop(GDK_DISPLAY(), "POLYP_SINK"); + x11_del_prop(GDK_DISPLAY(), "PULSE_SINK"); if (current_source) - x11_set_prop(GDK_DISPLAY(), "POLYP_SOURCE", current_source); + x11_set_prop(GDK_DISPLAY(), "PULSE_SOURCE", current_source); else - x11_del_prop(GDK_DISPLAY(), "POLYP_SOURCE"); + x11_del_prop(GDK_DISPLAY(), "PULSE_SOURCE"); /* This is used by module-x11-publish to detect whether the * properties have been altered. We delete this property here to * make sure that the module notices that it is no longer in * control */ - x11_del_prop(GDK_DISPLAY(), "POLYP_ID"); + x11_del_prop(GDK_DISPLAY(), "PULSE_ID"); } static void check_button_cb(GtkCheckButton *w, const gchar *key) { @@ -720,7 +720,7 @@ int main(int argc, char *argv[]) { setup_gconf(); - notify_init("Polypaudio Applet"); + notify_init("PulseAudio Applet"); get_x11_props(); diff --git a/src/padevchooser.glade b/src/padevchooser.glade index 3ce2f35..0267297 100644 --- a/src/padevchooser.glade +++ b/src/padevchooser.glade @@ -5,7 +5,7 @@ 6 - Polypaudio Applet Preferences + PulseAudio Applet Preferences GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/src/x11prop.c b/src/x11prop.c index e8a6dc9..6101651 100644 --- a/src/x11prop.c +++ b/src/x11prop.c @@ -1,20 +1,20 @@ /* $Id$ */ /*** - This file is part of polypaudio. + This file is part of pulseaudio. - polypaudio is free software; you can redistribute it and/or modify + pulseaudio is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - polypaudio is distributed in the hope that it will be useful, but + pulseaudio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with polypaudio; if not, write to the Free Software + along with pulseaudio; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ***/ diff --git a/src/x11prop.h b/src/x11prop.h index c908324..1346611 100644 --- a/src/x11prop.h +++ b/src/x11prop.h @@ -4,20 +4,20 @@ /* $Id$ */ /*** - This file is part of polypaudio. + This file is part of pulseaudio. - polypaudio is free software; you can redistribute it and/or modify + pulseaudio is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - polypaudio is distributed in the hope that it will be useful, but + pulseaudio is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with polypaudio; if not, write to the Free Software + along with pulseaudio; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ***/ -- cgit