From d3dd3d18a1e346fe98a3b460a99c0fb831afe257 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 8 Sep 2004 00:04:00 +0000 Subject: Assorted updates git-svn-id: file:///home/lennart/svn/public/paman/trunk@30 cdefa82f-4ce1-0310-97f5-ab6066f37c3c --- Makefile.am | 2 +- configure.ac | 4 ++-- doc/README.html.in | 9 ++++++--- doc/screenshot.png | Bin 70098 -> 270142 bytes src/ClientWindow.cc | 5 +++++ src/ClientWindow.hh | 1 + src/Makefile.am | 2 +- src/ModuleWindow.cc | 5 +++++ src/ModuleWindow.hh | 1 + src/SampleWindow.cc | 5 +++++ src/SampleWindow.hh | 1 + src/ServerInfoManager.cc | 2 +- src/SinkInputWindow.cc | 5 ++++- src/SinkInputWindow.hh | 1 + src/SinkWindow.cc | 5 ++++- src/SinkWindow.hh | 1 + src/SourceOutputWindow.cc | 4 ++++ src/SourceOutputWindow.hh | 1 + src/SourceWindow.cc | 5 +++++ src/SourceWindow.hh | 1 + src/StatWindow.cc | 5 +++++ src/StatWindow.hh | 1 + 22 files changed, 56 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1f88eca..f084ca4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,7 +31,7 @@ README: homepage: all dist test -d $$HOME/homepage/private mkdir -p $$HOME/homepage/private/projects/paman - cp *.tar.gz $$HOME/homepage/private/projects/paman + cp paman-@PACKAGE_VERSION@.tar.gz $$HOME/homepage/private/projects/paman cp doc/README.html doc/screenshot.png doc/style.css $$HOME/homepage/private/projects/paman cp $$HOME/homepage/private/projects/paman/README.html $$HOME/homepage/private/projects/paman/index.html diff --git a/configure.ac b/configure.ac index d3420af..547125e 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. AC_PREREQ(2.57) -AC_INIT([paman],[0.2],[mzcnzna (at) 0pointer (dot) de]) +AC_INIT([paman],[0.3],[mzcnzna (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/paman.cc]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign -Wall]) @@ -48,7 +48,7 @@ if test -d ../polypaudio ; then POLYP_LIBS='-L$(top_srcdir)/../polypaudio/polyp/.libs -lpolyp -lpolyp-mainloop-glib -lpolyp-mainloop-glib -lpolyp-error' echo "*** Found polypaudio in ../polypaudio, using that version ***" else - PKG_CHECK_MODULES(POLYP, [ polyplib >= 0.3 polyplib-glib-mainloop >= 0.3 ]) + PKG_CHECK_MODULES(POLYP, [ polyplib >= 0.4 polyplib-glib-mainloop >= 0.4 ]) fi AC_SUBST(POLYP_LIBS) diff --git a/doc/README.html.in b/doc/README.html.in index 690645f..85239fc 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -42,6 +42,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

News

+
Wed Sep 8 2004:

Version 0.3 released; changes include: compatibility with polypaudio 0.4; minor improvements and fixes

+
Fri Aug 27 2004:

Version 0.2 released; changes include: compatibility with polypaudio 0.3; minor fixes

@@ -65,7 +68,7 @@ cache.

Documentation

-

There is not much to say. Just run paman and see yourself. +

There is not much to say. Just run paman and see yourself.

Requirements

@@ -78,7 +81,7 @@ source code configuration.

paman requires gtkmm and glademmm installed.

-

Obviously paman requires an installation of polypaudio (version 0.3).

+

Obviously paman requires an installation of polypaudio (version 0.4).

Installation

@@ -103,7 +106,7 @@ compilation and make install (as root) for installation of

If you want to be notified whenever I release a new version of this software use the subscription feature of Freshmeat.

-
Lennart Poettering <@PACKAGE_BUGREPORT@>, August 2004
+
Lennart Poettering <@PACKAGE_BUGREPORT@>, September 2004
$Id$
diff --git a/doc/screenshot.png b/doc/screenshot.png index 18a6b91..1fc4f0d 100644 Binary files a/doc/screenshot.png and b/doc/screenshot.png differ diff --git a/src/ClientWindow.cc b/src/ClientWindow.cc index 88e2ad3..b0bf5d8 100644 --- a/src/ClientWindow.cc +++ b/src/ClientWindow.cc @@ -57,3 +57,8 @@ void ClientWindow::onToOwnerModuleButton() { if (owner_module != (uint32_t) -1) serverInfoManager->showModuleWindow(owner_module); } + +bool ClientWindow::on_delete_event(GdkEventAny* e) { + hide(); + return false; +} diff --git a/src/ClientWindow.hh b/src/ClientWindow.hh index 8440daf..f65cdc4 100644 --- a/src/ClientWindow.hh +++ b/src/ClientWindow.hh @@ -27,6 +27,7 @@ public: virtual void onCloseButton(); virtual void onToOwnerModuleButton(); + virtual bool on_delete_event(GdkEventAny* e); }; #endif diff --git a/src/Makefile.am b/src/Makefile.am index 5631315..8613a60 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,4 +17,4 @@ paman_SOURCES=MainWindow.cc MainWindow.hh \ paman_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(POLYP_LIBS) paman_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(POLYP_CFLAGS) -#paman_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/paman.glade\" +paman_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/paman.glade\" diff --git a/src/ModuleWindow.cc b/src/ModuleWindow.cc index 04d8fb5..4c44cd4 100644 --- a/src/ModuleWindow.cc +++ b/src/ModuleWindow.cc @@ -56,3 +56,8 @@ void ModuleWindow::updateInfo(const ModuleInfo &i) { void ModuleWindow::onCloseButton() { hide(); } + +bool ModuleWindow::on_delete_event(GdkEventAny* e) { + hide(); + return false; +} diff --git a/src/ModuleWindow.hh b/src/ModuleWindow.hh index 989e85a..daec735 100644 --- a/src/ModuleWindow.hh +++ b/src/ModuleWindow.hh @@ -24,6 +24,7 @@ public: void updateInfo(const ModuleInfo &i); virtual void onCloseButton(); + virtual bool on_delete_event(GdkEventAny* e); }; #endif diff --git a/src/SampleWindow.cc b/src/SampleWindow.cc index 5b254f0..c3ff7fc 100644 --- a/src/SampleWindow.cc +++ b/src/SampleWindow.cc @@ -58,3 +58,8 @@ void SampleWindow::updateInfo(const SampleInfo &i) { void SampleWindow::onCloseButton() { hide(); } + +bool SampleWindow::on_delete_event(GdkEventAny* e) { + hide(); + return false; +} diff --git a/src/SampleWindow.hh b/src/SampleWindow.hh index a7c99dd..71c9930 100644 --- a/src/SampleWindow.hh +++ b/src/SampleWindow.hh @@ -25,6 +25,7 @@ public: void updateInfo(const SampleInfo &i); virtual void onCloseButton(); + virtual bool on_delete_event(GdkEventAny* e); }; #endif diff --git a/src/ServerInfoManager.cc b/src/ServerInfoManager.cc index a21033e..02268ec 100644 --- a/src/ServerInfoManager.cc +++ b/src/ServerInfoManager.cc @@ -186,7 +186,7 @@ void SinkInputInfo::update(const struct pa_sink_input_info &i) { owner_module = i.owner_module; volume = i.volume; buffer_usec = i.buffer_usec; - sink_usec = i.buffer_usec; + sink_usec = i.sink_usec; if (window) window->updateInfo(*this); diff --git a/src/SinkInputWindow.cc b/src/SinkInputWindow.cc index bfbbbfa..19546a6 100644 --- a/src/SinkInputWindow.cc +++ b/src/SinkInputWindow.cc @@ -134,4 +134,7 @@ void SinkInputWindow::onVolumeMuteButton() { serverInfoManager->setSinkInputVolume(index, PA_VOLUME_MUTED); } - +bool SinkInputWindow::on_delete_event(GdkEventAny* e) { + hide(); + return false; +} diff --git a/src/SinkInputWindow.hh b/src/SinkInputWindow.hh index aaf76f4..350f18d 100644 --- a/src/SinkInputWindow.hh +++ b/src/SinkInputWindow.hh @@ -42,6 +42,7 @@ public: virtual void onVolumeScaleValueChanged(); virtual void onVolumeResetButton(); virtual void onVolumeMuteButton(); + virtual bool on_delete_event(GdkEventAny* e); }; #endif diff --git a/src/SinkWindow.cc b/src/SinkWindow.cc index 37a84b4..4a205d1 100644 --- a/src/SinkWindow.cc +++ b/src/SinkWindow.cc @@ -114,4 +114,7 @@ void SinkWindow::onVolumeMuteButton() { serverInfoManager->setSinkVolume(index, PA_VOLUME_MUTED); } - +bool SinkWindow::on_delete_event(GdkEventAny* e) { + hide(); + return false; +} diff --git a/src/SinkWindow.hh b/src/SinkWindow.hh index b0417aa..1cb6708 100644 --- a/src/SinkWindow.hh +++ b/src/SinkWindow.hh @@ -40,6 +40,7 @@ public: virtual void onVolumeScaleValueChanged(); virtual void onVolumeResetButton(); virtual void onVolumeMuteButton(); + virtual bool on_delete_event(GdkEventAny* e); }; #endif diff --git a/src/SourceOutputWindow.cc b/src/SourceOutputWindow.cc index 0b742d2..30808f3 100644 --- a/src/SourceOutputWindow.cc +++ b/src/SourceOutputWindow.cc @@ -97,3 +97,7 @@ void SourceOutputWindow::onToSourceButton() { serverInfoManager->showSourceWindow(source); } +bool SourceOutputWindow::on_delete_event(GdkEventAny* e) { + hide(); + return false; +} diff --git a/src/SourceOutputWindow.hh b/src/SourceOutputWindow.hh index a98a9d0..81ec128 100644 --- a/src/SourceOutputWindow.hh +++ b/src/SourceOutputWindow.hh @@ -33,6 +33,7 @@ public: virtual void onToOwnerModuleButton(); virtual void onToClientButton(); virtual void onToSourceButton(); + virtual bool on_delete_event(GdkEventAny* e); }; #endif diff --git a/src/SourceWindow.cc b/src/SourceWindow.cc index aa08ced..a396c6a 100644 --- a/src/SourceWindow.cc +++ b/src/SourceWindow.cc @@ -80,3 +80,8 @@ void SourceWindow::onToOwnerModuleButton() { if (owner_module != (uint32_t) -1) serverInfoManager->showModuleWindow(owner_module); } + +bool SourceWindow::on_delete_event(GdkEventAny* e) { + hide(); + return false; +} diff --git a/src/SourceWindow.hh b/src/SourceWindow.hh index 964d64f..315f8d9 100644 --- a/src/SourceWindow.hh +++ b/src/SourceWindow.hh @@ -27,6 +27,7 @@ public: virtual void onCloseButton(); virtual void onParentSinkButton(); virtual void onToOwnerModuleButton(); + virtual bool on_delete_event(GdkEventAny* e); }; #endif diff --git a/src/StatWindow.cc b/src/StatWindow.cc index 6e0c4b8..c1226d9 100644 --- a/src/StatWindow.cc +++ b/src/StatWindow.cc @@ -79,3 +79,8 @@ void StatWindow::present() { onRefreshButton(); } + +bool StatWindow::on_delete_event(GdkEventAny* e) { + hide(); + return false; +} diff --git a/src/StatWindow.hh b/src/StatWindow.hh index f3461f0..c120e51 100644 --- a/src/StatWindow.hh +++ b/src/StatWindow.hh @@ -24,6 +24,7 @@ public: virtual void onCloseButton(); virtual void onRefreshButton(); + virtual bool on_delete_event(GdkEventAny* e); struct pa_operation *operation; -- cgit