scgraph/scgraph.patch

   1 diff -aur scgraph-0.13/server/control_loop.cc src/scgraph-0.13/server/control_loop.cc
   2 --- scgraph-0.13/server/control_loop.cc 2008-07-05 23:52:16.000000000 +0200
   3 +++ src/scgraph-0.13/server/control_loop.cc     2011-08-31 13:58:46.000000000 +0200
   4 @@ -17,8 +17,7 @@
   5         _quit (false),
   6         _freq (Options::get_instance()->_control_rate)
   7  {
   8 -       int ret;
   9 -       ret = pthread_mutex_init (&_mutex, 0);
  10 +       pthread_mutex_init (&_mutex, 0);
  11
  12  }
  13
  14 @@ -33,8 +32,7 @@
  15  {
  16         Options *options = Options::get_instance ();
  17
  18 -       int ret;
  19 -       ret = pthread_create (&_thread, 0, c_control_thread_func, this);
  20 +       pthread_create (&_thread, 0, c_control_thread_func, this);
  21
  22         if (options->_verbose >= 2)
  23                 std::cout << "[ControlLoop]: Running!" << std::endl;
  24 @@ -42,21 +40,19 @@
  25
  26  void ControlLoop::stop ()
  27  {
  28 -       int ret;
  29 -
  30 -       ret = pthread_mutex_lock (&_mutex);
  31 +       pthread_mutex_lock (&_mutex);
  32         _quit = true;
  33 -       ret = pthread_mutex_unlock (&_mutex);
  34 +       pthread_mutex_unlock (&_mutex);
  35
  36 -       ret = pthread_join (_thread, 0);
  37 +       pthread_join (_thread, 0);
  38  }
  39
  40
  41  void ControlLoop::set_rate (int rate)
  42  {
  43 -       int ret = pthread_mutex_lock (&_mutex);
  44 +       pthread_mutex_lock (&_mutex);
  45         _freq = rate;
  46 -       ret = pthread_mutex_unlock (&_mutex);
  47 +       pthread_mutex_unlock (&_mutex);
  48  }
  49
  50  void *c_control_thread_func (void *arg)
  51 diff -aur scgraph-0.13/server/jack_client.cc src/scgraph-0.13/server/jack_client.cc
  52 --- scgraph-0.13/server/jack_client.cc  2008-07-05 23:52:16.000000000 +0200
  53 +++ src/scgraph-0.13/server/jack_client.cc      2011-08-31 13:58:46.000000000 +0200
  54 @@ -27,13 +27,16 @@
  55  {
  56         Options *options = Options::get_instance ();
  57
  58 +       jack_status_t jack_status;
  59 +       jack_options_t  jack_options = JackNullOption;
  60 +
  61         if (options->_verbose >= 1)
  62                 std::cout << "[JackClient]: Initializing " << num_of_ports << " ports" << std::endl;
  63
  64         if (num_of_ports == 0)
  65                 return;
  66
  67 -       _client = jack_client_new (_jack_name.c_str ());
  68 +       _client = jack_client_open (_jack_name.c_str (), jack_options, &jack_status);
  69         if (!_client)
  70                 throw ("[JackClient]: Error: couldn't register as jack client");
  71
  72 diff -aur scgraph-0.13/server/Makefile src/scgraph-0.13/server/Makefile
  73 --- scgraph-0.13/server/Makefile        2009-01-22 12:03:14.000000000 +0100
  74 +++ src/scgraph-0.13/server/Makefile    2011-08-31 13:58:46.000000000 +0200
  75 @@ -73,8 +73,8 @@
  76    COMPILE_FLAGS +=  -DSC_DARWIN
  77  endif
  78
  79 -#LINK_FLAGS = -lpthread $(ADDITIONAL_LINK_FLAGS) $(QT_LINK_FLAGS) -lm `pkg-config sndfile GraphicsMagick++ --cflags --libs`
  80 -LINK_FLAGS = -lpthread $(ADDITIONAL_LINK_FLAGS) $(QT_LINK_FLAGS) -lm `pkg-config sndfile --cflags --static` /Users/fschmidt/local/opt/GraphicsMagick-1.3.1/lib/libGraphicsMagick++.a  /Users/fschmidt/local/opt/GraphicsMagick-1.3.1/lib/libGraphicsMagick.a
  81 +LINK_FLAGS = -lpthread $(ADDITIONAL_LINK_FLAGS) $(QT_LINK_FLAGS) -lm `pkg-config sndfile GraphicsMagick++ --cflags --libs`
  82 +#LINK_FLAGS = -lpthread $(ADDITIONAL_LINK_FLAGS) $(QT_LINK_FLAGS) -lm `pkg-config sndfile --cflags --static` /usr/lib/libGraphicsMagick++.a  /usr/lib/libGraphicsMagick.a
  83
  84  ifeq ($(HAVE_JACK),1)
  85    LINK_FLAGS += `pkg-config jack --libs fftw3f` -DHAVE_JACK
  86 diff -aur scgraph-0.13/server/plugin_pool.cc src/scgraph-0.13/server/plugin_pool.cc
  87 --- scgraph-0.13/server/plugin_pool.cc  2009-01-22 14:54:41.000000000 +0100
  88 +++ src/scgraph-0.13/server/plugin_pool.cc      2011-08-31 13:59:52.000000000 +0200
  89 @@ -4,7 +4,9 @@
  90
  91  #include "options.h"
  92
  93 +#ifndef  _XOPEN_SOURCE
  94  #define _XOPEN_SOURCE 600
  95 +#endif
  96  #include <stdlib.h>
  97
  98  #include <stdlib.h>
  99 diff -aur scgraph-0.13/server/plugins/gl_renderer.cc src/scgraph-0.13/server/plugins/gl_renderer.cc
 100 --- scgraph-0.13/server/plugins/gl_renderer.cc  2008-12-10 17:41:49.000000000 +0100
 101 +++ src/scgraph-0.13/server/plugins/gl_renderer.cc      2011-08-31 13:58:46.000000000 +0200
 102 @@ -5,7 +5,7 @@
 103  #include "../texture_pool.h"
 104
 105
 106 -
 107 +#include <stdio.h>
 108  #include <pthread.h>
 109  #include <unistd.h>
 110