upgrade to sigc++ 2.0

ghewgill · Jan 1, 2013 · f7e1d5e · f7e1d5e
1 parent 15073b7
commit f7e1d5e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/capture.cpp b/capture.cpp
@@ -303,8 +303,8 @@ int main(int argc, char *argv[])
         }
     }
     eas::Demodulator demodulator;
-    demodulator.activate.connect(SigC::slot(eas_activate));
-    demodulator.deactivate.connect(SigC::slot(eas_deactivate));
+    demodulator.activate.connect(sigc::ptr_fun(eas_activate));
+    demodulator.deactivate.connect(sigc::ptr_fun(eas_deactivate));
     for (;;) {
         char buf[4096];
         int n = fread(buf, 1, sizeof(buf), f);

diff --git a/configure.ac b/configure.ac
@@ -24,7 +24,7 @@ AC_CHECK_HEADER([pcre.h])
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
 
-PKG_CHECK_MODULES(SIGC, sigc++-1.2)
+PKG_CHECK_MODULES(SIGC, sigc++-2.0)
 # this is commented because insertdb depends on a very old version of libpq
 #PKG_CHECK_MODULES(PQ, pq)
 

diff --git a/eas_demod.h b/eas_demod.h
@@ -8,8 +8,8 @@ class Demodulator {
 public:
     Demodulator();
     void demod(const float *buf, int n);
-    SigC::Signal1<void, const char *> activate;
-    SigC::Signal0<void> deactivate;
+    sigc::signal1<void, const char *> activate;
+    sigc::signal0<void> deactivate;
 private:
     enum {CORRLEN = 18};
     enum {BPHASESTEP = (int)(0x10000/(1920e-6*11025))};

diff --git a/monitor.cpp b/monitor.cpp
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
         }
     }
     eas::Demodulator demodulator;
-    demodulator.activate.connect(SigC::slot(eas_activate));
+    demodulator.activate.connect(sigc::ptr_fun(eas_activate));
     writeTitle();
     for (;;) {
         char buf[4096];