libspiralcore/patches.diff

   1 --- libspiralcore-1.0.0rc1/SConstruct.orig      2008-06-19 20:47:14.748765486 -0300
   2 +++ libspiralcore-1.0.0rc1/SConstruct   2008-06-19 20:47:14.748765486 -0300
   3 @@ -1,9 +1,14 @@
   4  Target       = "libspiralcore.so"
   5 -Install         = "/usr/local/lib"
   6 -IncInstall      = "/usr/local/include/spiralcore"
   7 -LibPaths     = Split("/usr/local/lib")
   8 -IncludePaths = Split("./include /usr/local/include")
   9 -
  10 +prefix       = "/usr/local"
  11 +if ARGUMENTS.get('prefix', 0):
  12 +    prefix = ARGUMENTS.get('prefix', 0)
  13 +Install         = prefix+"/lib"
  14 +IncInstall      = prefix+"/include/spiralcore"
  15 +LibPaths     = Split(prefix+"/lib")
  16 +IncludePaths = Split("./include "+prefix+"/include")
  17 +
  18 +
  19 +
  20  Libs = Split("sndfile jack lo m")
  21
  22  Source = Split("src/ChannelHandler.cpp \
  23 --- libspiralcore-1.0.0rc1/include/JackClient.h.orig    2008-06-19 20:47:14.145431926 -0300
  24 +++ libspiralcore-1.0.0rc1/include/JackClient.h 2008-06-19 20:47:14.145431926 -0300
  25 @@ -67,7 +67,7 @@
  26         class JackPort
  27         {
  28                 public:
  29 -               JackPort::JackPort() :
  30 +               JackPort() :
  31                         Connected(false),Buf(NULL),Port(NULL) {}
  32
  33                 string         Name;
  34 --- libspiralcore-1.0.0rc1/include/Sample.h.orig        2008-06-19 20:47:14.145431926 -0300
  35 +++ libspiralcore-1.0.0rc1/include/Sample.h     2008-06-19 20:47:14.145431926 -0300
  36 @@ -70,7 +70,7 @@
  37         void Shrink(int Length);
  38         void CropTo(int NewLength);
  39
  40 -       inline AudioType &Sample::operator[](unsigned int i) const
  41 +       inline AudioType &operator[](unsigned int i) const
  42         {
  43                 #ifdef DEBUG
  44                         assert(i>=0 && i<m_Length);
  45 @@ -78,14 +78,14 @@
  46                 return m_Data[i];
  47         }
  48
  49 -       inline AudioType &Sample::operator[](int i) const
  50 +       inline AudioType &operator[](int i) const
  51         {
  52                 //return (*this)[(int)i];
  53                 return m_Data[i];
  54         }
  55
  56         // Linear interpolated
  57 -       inline AudioType Sample::operator[](float i) const
  58 +       inline AudioType operator[](float i) const
  59         {
  60                 int ii=(int)i;
  61
  62 @@ -99,7 +99,7 @@
  63         }
  64
  65
  66 -       inline void Sample::Set(int i, AudioType v)
  67 +       inline void Set(int i, AudioType v)
  68         {
  69                 #ifdef DEBUG
  70                         assert(i>=0 && i<m_Length);
  71 @@ -107,7 +107,7 @@
  72                 m_Data[i]=v;
  73         }
  74
  75 -       inline Sample &Sample::operator=(const Sample &rhs)
  76 +       inline Sample &operator=(const Sample &rhs)
  77         {
  78                 if (GetLength()!=rhs.GetLength()) Allocate(rhs.GetLength());
  79                 memcpy(m_Data,rhs.GetBuffer(),GetLengthInBytes());
  80 --- libspiralcore-1.0.0rc1/src/ChannelHandler.cpp.orig  2008-06-19 20:47:14.639396206 -0300
  81 +++ libspiralcore-1.0.0rc1/src/ChannelHandler.cpp       2008-06-19 20:47:14.639396206 -0300
  82 @@ -16,6 +16,8 @@
  83
  84  #include "ChannelHandler.h"
  85  #include <unistd.h>
  86 +#include <cstdlib>
  87 +#include <cstring>
  88
  89  using namespace std;
  90  using namespace spiralcore;
  91 --- libspiralcore-1.0.0rc1/src/JackClient.cpp.orig      2008-06-19 20:47:14.639396206 -0300
  92 +++ libspiralcore-1.0.0rc1/src/JackClient.cpp   2008-06-19 20:47:14.639396206 -0300
  93 @@ -16,6 +16,7 @@
  94
  95  #include <stdio.h>
  96  #include <limits.h>
  97 +#include <cstring>
  98
  99  #include "JackClient.h"
 100  #include "NETypes.h"
 101 --- libspiralcore-1.0.0rc1/src/Tuna.cpp.orig    2008-06-19 20:47:14.663394252 -0300
 102 +++ libspiralcore-1.0.0rc1/src/Tuna.cpp 2008-06-19 20:47:14.663394252 -0300
 103 @@ -18,6 +18,7 @@
 104  #include <math.h>
 105  #include <float.h>
 106  #include <iostream>
 107 +#include <cstdlib>
 108  #include "Tuna.h"
 109
 110  static const float MAX_LUT_FREQ = 24000.0; // (maximum audible freq (apparently))
 111 --- libspiralcore-1.0.0rc1/src/OSCServer.cpp.orig       2008-06-19 20:47:14.663394252 -0300
 112 +++ libspiralcore-1.0.0rc1/src/OSCServer.cpp    2008-06-19 20:47:14.663394252 -0300
 113 @@ -18,6 +18,7 @@
 114  #include <cstdlib>
 115  #include <unistd.h>
 116  #include <iostream>
 117 +#include <cstring>
 118
 119  #include "OSCServer.h"
 120