summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-09-08 00:04:00 +0000
committerLennart Poettering <lennart@poettering.net>2004-09-08 00:04:00 +0000
commitd3dd3d18a1e346fe98a3b460a99c0fb831afe257 (patch)
tree0a0b557cbf3209b1a520c4c44c891a1f76ab0bc5 /src
parent2a8d238797d6fffa6490b21e52d6abf3f533a5f6 (diff)
Assorted updates
git-svn-id: file:///home/lennart/svn/public/paman/trunk@30 cdefa82f-4ce1-0310-97f5-ab6066f37c3c
Diffstat (limited to 'src')
-rw-r--r--src/ClientWindow.cc5
-rw-r--r--src/ClientWindow.hh1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/ModuleWindow.cc5
-rw-r--r--src/ModuleWindow.hh1
-rw-r--r--src/SampleWindow.cc5
-rw-r--r--src/SampleWindow.hh1
-rw-r--r--src/ServerInfoManager.cc2
-rw-r--r--src/SinkInputWindow.cc5
-rw-r--r--src/SinkInputWindow.hh1
-rw-r--r--src/SinkWindow.cc5
-rw-r--r--src/SinkWindow.hh1
-rw-r--r--src/SourceOutputWindow.cc4
-rw-r--r--src/SourceOutputWindow.hh1
-rw-r--r--src/SourceWindow.cc5
-rw-r--r--src/SourceWindow.hh1
-rw-r--r--src/StatWindow.cc5
-rw-r--r--src/StatWindow.hh1
18 files changed, 47 insertions, 4 deletions
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;