itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/polyp/pulse/g 

git-svn-id: file:///home/lennart/svn/public/pavucontrol/trunk@26 c17c95f2-f111-0410-90bf-f30a9569010c
This commit is contained in:
Lennart Poettering 2006-06-20 23:48:27 +00:00
parent 2dead09f8f
commit 789012dd4c
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -20,7 +20,7 @@
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT([pavucontrol],[0.9.1],[mzcnihpbageby (at) 0pointer (dot) de]) AC_INIT([pavucontrol],[0.9.2],[mzcnihpbageby (at) 0pointer (dot) de])
AC_CONFIG_SRCDIR([src/pavucontrol.cc]) AC_CONFIG_SRCDIR([src/pavucontrol.cc])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
@ -43,16 +43,16 @@ PKG_CHECK_MODULES(GUILIBS, [ gtkmm-2.4 libglademm-2.4 sigc++-2.0 ])
AC_SUBST(GUILIBS_CFLAGS) AC_SUBST(GUILIBS_CFLAGS)
AC_SUBST(GUILIBS_LIBS) AC_SUBST(GUILIBS_LIBS)
if test -d ../polypaudio ; then if test -d ../pulseaudio ; then
POLYP_CFLAGS='-I$(top_srcdir)/../polypaudio/src' PULSE_CFLAGS='-I$(top_srcdir)/../pulseaudio/src'
POLYP_LIBS='-L$(top_srcdir)/../polypaudio/src/.libs -lpolyp -lpolyp-mainloop-glib' PULSE_LIBS='-L$(top_srcdir)/../pulseaudio/src/.libs -lpulse -lpulse-mainloop-glib'
echo "*** Found polypaudio in ../polypaudio, using that version ***" echo "*** Found pulseaudio in ../pulseaudio, using that version ***"
else else
PKG_CHECK_MODULES(POLYP, [ polyplib >= 0.9.0 polyplib-glib-mainloop >= 0.9.0 ]) PKG_CHECK_MODULES(PULSE, [ libpulse >= 0.9.2 libpulse-mainloop-glib >= 0.9.2 ])
fi fi
AC_SUBST(POLYP_LIBS) AC_SUBST(PULSE_LIBS)
AC_SUBST(POLYP_CFLAGS) AC_SUBST(PULSE_CFLAGS)
# If using GCC specifiy some additional parameters # If using GCC specifiy some additional parameters
if test "x$GCC" = "xyes" ; then if test "x$GCC" = "xyes" ; then

4
src/Makefile.am
View File

@ -26,6 +26,6 @@ dist_desktop_DATA=pavucontrol.desktop
pavucontrol_SOURCES=pavucontrol.cc pavucontrol_SOURCES=pavucontrol.cc
pavucontrol_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(POLYP_LIBS) pavucontrol_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(PULSE_LIBS)
pavucontrol_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(POLYP_CFLAGS) pavucontrol_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(PULSE_CFLAGS)
pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/pavucontrol.glade\" pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/pavucontrol.glade\"

6
src/pavucontrol.cc
View File

@ -24,8 +24,8 @@
#include <gtkmm.h> #include <gtkmm.h>
#include <libglademm.h> #include <libglademm.h>
#include <polyp/polypaudio.h> #include <pulse/pulseaudio.h>
#include <polyp/glib-mainloop.h> #include <pulse/glib-mainloop.h>
#ifndef GLADE_FILE #ifndef GLADE_FILE
#define GLADE_FILE "pavucontrol.glade" #define GLADE_FILE "pavucontrol.glade"
@ -751,7 +751,7 @@ int main(int argc, char *argv[]) {
g_assert(m); g_assert(m);
pa_mainloop_api *api = pa_glib_mainloop_get_api(m); pa_mainloop_api *api = pa_glib_mainloop_get_api(m);
g_assert(api); g_assert(api);
context = pa_context_new(api, "Polypaudio Volume Control"); context = pa_context_new(api, "PulseAudio Volume Control");
g_assert(context); g_assert(context);
pa_context_set_state_callback(context, context_state_callback, mainWindow); pa_context_set_state_callback(context, context_state_callback, mainWindow);

2
src/pavucontrol.desktop
View File

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Version=1.0 Version=1.0
Encoding=UTF-8 Encoding=UTF-8
Name=Polypaudio Volume Control Name=PulseAudio Volume Control
GenericName=Volume Control GenericName=Volume Control
Comment=Adjust the volume level Comment=Adjust the volume level
Exec=pavucontrol Exec=pavucontrol

4
src/pavucontrol.glade
View File

@ -4,7 +4,7 @@
<glade-interface> <glade-interface>
<widget class="GtkWindow" id="mainWindow"> <widget class="GtkWindow" id="mainWindow">
<property name="title" translatable="yes">Polypaudio Volume Control</property> <property name="title" translatable="yes">PulseAudio Volume Control</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property> <property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property> <property name="modal">False</property>
@ -66,7 +66,7 @@
<child> <child>
<widget class="GtkLabel" id="titleLabel"> <widget class="GtkLabel" id="titleLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">&lt;span size=&quot;18000&quot; color=&quot;black&quot;&gt;&lt;b&gt;Polypaudio Volume Control&lt;/b&gt;&lt;/span&gt;</property> <property name="label" translatable="yes">&lt;span size=&quot;18000&quot; color=&quot;black&quot;&gt;&lt;b&gt;PulseAudio Volume Control&lt;/b&gt;&lt;/span&gt;</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">True</property> <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>