summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile9
-rw-r--r--src/Makefile.am13
-rw-r--r--src/ServerInfo.cc9
-rw-r--r--src/paman.cc2
4 files changed, 24 insertions, 9 deletions
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 8a9cb3a..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-
-CXXFLAGS=`pkg-config gtkmm-2.4 libglademm-2.4 --cflags` -Wall -W -pipe -O0 -g -Wno-unused -I../polypaudio
-LIBS=`pkg-config gtkmm-2.4 libglademm-2.4 --libs` -L../polypaudio/polyp/.libs -lpolyp -lpolyp-mainloop-glib -lpolyp-error
-
-paman: paman.o MainWindow.o SinkWindow.o SourceWindow.o ServerInfo.o ClientWindow.o ModuleWindow.o
- $(CXX) $^ -o $@ $(LIBS)
-
-clean:
- rm -rf *.o paman
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..3905db3
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,13 @@
+
+bin_PROGRAMS=paman
+
+paman_SOURCES=MainWindow.cc MainWindow.hh \
+ SinkWindow.cc SinkWindow.hh \
+ SourceWindow.cc SourceWindow.hh \
+ ServerInfo.cc ServerInfo.hh \
+ paman.cc paman.hh \
+ ClientWindow.cc ClientWindow.hh \
+ ModuleWindow.cc ModuleWindow.hh
+
+paman_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(POLYP_LIBS)
+paman_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(POLYP_CFLAGS)
diff --git a/src/ServerInfo.cc b/src/ServerInfo.cc
index fc7fe4e..8362f75 100644
--- a/src/ServerInfo.cc
+++ b/src/ServerInfo.cc
@@ -159,6 +159,15 @@ void ModuleInfo::showWindow() {
}
}
+extern "C" {
+ static void server_info_callback(struct pa_context *c, const struct pa_server_info *i, void *userdata);
+ static void sink_info_callback(struct pa_context *c, const struct pa_sink_info *i, int is_last, void *userdata);
+ static void source_info_callback(struct pa_context *c, const struct pa_source_info *i, int is_last, void *userdata);
+ static void client_info_callback(struct pa_context *c, const struct pa_client_info *i, int is_last, void *userdata);
+ static void module_info_callback(struct pa_context *c, const struct pa_module_info *i, int is_last, void *userdata);
+ static void subscribe_callback(struct pa_context *c, enum pa_subscription_event_type t, uint32_t index, void *userdata);
+};
+
static void server_info_callback(struct pa_context *c, const struct pa_server_info *i, void *userdata) {
ServerInfoManager *si = (ServerInfoManager*) userdata;
diff --git a/src/paman.cc b/src/paman.cc
index 0c1741d..4b9b364 100644
--- a/src/paman.cc
+++ b/src/paman.cc
@@ -16,6 +16,8 @@ ServerInfoManager *serverInfoManager = NULL;
struct pa_context *context = NULL;
struct pa_mainloop_api *mainloop_api = NULL;
+extern "C" static void context_state_callback(struct pa_context *c, void *userdata);
+
static void context_state_callback(struct pa_context *c, void *userdata) {
g_assert(c && mainWindow);