Update upstream source from tag 'upstream/1.15'

Update to upstream version '1.15'
with Debian dir 3b217fcd63314f946cb36492e0b85e7328ada240

1 files changed, 35 insertions, 17 deletions

diff --git a/src/plugins/sine.cpp b/src/plugins/sine.cpp
index c3d1a6e..012ad8e 100644
--- a/src/plugins/sine.cpp
+++ b/src/plugins/sine.cpp
@@ -15,9 +15,9 @@
 
 /*****************************************************************************/
 
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 /*****************************************************************************/
 
@@ -37,12 +37,12 @@
 #define SINE_TABLE_BITS 14
 #define SINE_TABLE_SHIFT (8 * sizeof(unsigned long) - SINE_TABLE_BITS)
 
-LADSPA_Data * g_pfSineTable = NULL;
-LADSPA_Data g_fPhaseStepBase = 0;
+static LADSPA_Data * g_pfSineTable = NULL;
+static LADSPA_Data g_fPhaseStepBase = 0;
 
 /*****************************************************************************/
 
-inline char * 
+static inline char * 
 localStrdup(const char * input) {
   char * output = new char[strlen(input) + 1];
   strcpy(output, input);
@@ -51,7 +51,7 @@ localStrdup(const char * input) {
 
 /*****************************************************************************/
 
-void
+static void
 initialise_sine_table() {
   if (g_pfSineTable == NULL) {
     long lTableSize = (1 << SINE_TABLE_BITS);
@@ -68,6 +68,22 @@ initialise_sine_table() {
 
 /*****************************************************************************/
 
+static LADSPA_Handle instantiateSineOscillator(const LADSPA_Descriptor *,
+                                               unsigned long SampleRate);
+static void connectPortToSineOscillator(LADSPA_Handle Instance,
+                                        unsigned long Port,
+                                        LADSPA_Data * DataLocation);
+static void activateSineOscillator(void * pvHandle);
+static void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance,
+                                                 unsigned long SampleCount);
+static void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance,
+                                                unsigned long SampleCount);
+static void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance,
+                                                unsigned long SampleCount);
+static void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance,
+                                               unsigned long SampleCount);
+static void cleanupSineOscillator(void *pvHandle);
+
 class SineOscillator {
 private:
 
@@ -120,7 +136,7 @@ private:
 
 /*****************************************************************************/
 
-LADSPA_Handle 
+static LADSPA_Handle 
 instantiateSineOscillator(const LADSPA_Descriptor *,
                           unsigned long SampleRate) {
   return new SineOscillator(SampleRate);
@@ -128,7 +144,7 @@ instantiateSineOscillator(const LADSPA_Descriptor *,
 
 /*****************************************************************************/
 
-void 
+static void 
 connectPortToSineOscillator(LADSPA_Handle Instance,
                             unsigned long Port,
                             LADSPA_Data * DataLocation) {
@@ -147,14 +163,14 @@ connectPortToSineOscillator(LADSPA_Handle Instance,
 
 /*****************************************************************************/
 
-void
+static void
 activateSineOscillator(void * pvHandle) {
   ((SineOscillator *)pvHandle)->m_lPhase = 0;
 }
 
 /*****************************************************************************/
 
-void 
+static void 
 runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance,
                                      unsigned long SampleCount) {
   SineOscillator * poSineOscillator = (SineOscillator *)Instance;
@@ -174,7 +190,7 @@ runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance,
 
 /*****************************************************************************/
 
-void
+static void
 runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance,
                                     unsigned long SampleCount) {
   SineOscillator * poSineOscillator = (SineOscillator *)Instance;
@@ -195,7 +211,7 @@ runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance,
 
 /*****************************************************************************/
 
-void
+static void
 runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance,
                                     unsigned long SampleCount) {
   SineOscillator * poSineOscillator = (SineOscillator *)Instance;
@@ -212,7 +228,7 @@ runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance,
 
 /*****************************************************************************/
 
-void
+static void
 runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance,
                                    unsigned long SampleCount) {
   SineOscillator * poSineOscillator = (SineOscillator *)Instance;
@@ -230,7 +246,7 @@ runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance,
 
 /*****************************************************************************/
 
-void
+static void
 cleanupSineOscillator(void *pvHandle) {
   delete (SineOscillator *)pvHandle;
 }
@@ -239,7 +255,7 @@ cleanupSineOscillator(void *pvHandle) {
 
 typedef char * char_ptr;
 
-LADSPA_Descriptor * g_psDescriptors[4] = { NULL, NULL, NULL, NULL };
+static LADSPA_Descriptor * g_psDescriptors[4] = { NULL, NULL, NULL, NULL };
 
 /*****************************************************************************/
 
@@ -403,7 +419,9 @@ public:
     delete [] g_pfSineTable;
   }
 
-} g_oShutdownStartupHandler;
+};
+
+static StartupShutdownHandler g_oShutdownStartupHandler;
 
 /*****************************************************************************/