diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-09 18:30:17 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-09 18:30:17 +0000 |
commit | 9f1903d96cccc7cb2f456d68d31446fa739905f7 (patch) | |
tree | 1c30a654f041dbb7614a2f8d64243b2e40336e0a /muse2/synti | |
parent | 703f47458a859c9559c13038246dd37529eba6ff (diff) |
Fix compiler warnings, and a typo in the transport max slider value.
Diffstat (limited to 'muse2/synti')
-rw-r--r-- | muse2/synti/deicsonze/deicsonze.cpp | 2 | ||||
-rw-r--r-- | muse2/synti/fluidsynth/fluidsynti.cpp | 1 | ||||
-rw-r--r-- | muse2/synti/fluidsynth/fluidsynti.h | 2 | ||||
-rw-r--r-- | muse2/synti/simpledrums2/simpledrums.cpp | 2 | ||||
-rw-r--r-- | muse2/synti/simpledrums2/ssplugin.cpp | 6 |
5 files changed, 7 insertions, 6 deletions
diff --git a/muse2/synti/deicsonze/deicsonze.cpp b/muse2/synti/deicsonze/deicsonze.cpp index 519a7f05..5ab39ee8 100644 --- a/muse2/synti/deicsonze/deicsonze.cpp +++ b/muse2/synti/deicsonze/deicsonze.cpp @@ -3609,7 +3609,7 @@ const char* DeicsOnze::getPatchName(int ch, int val, int) const { if (lbank == 127) // drum HACK lbank = 128; int prog = val & 0x7f; - char* tempName="INITVOICE"; + const char* tempName="INITVOICE"; p_preset=_set->findPreset(hbank, lbank, prog); if (p_preset) tempName=const_cast<char *>(p_preset->name.c_str()); return tempName; diff --git a/muse2/synti/fluidsynth/fluidsynti.cpp b/muse2/synti/fluidsynth/fluidsynti.cpp index 0802614b..ffd72561 100644 --- a/muse2/synti/fluidsynth/fluidsynti.cpp +++ b/muse2/synti/fluidsynth/fluidsynti.cpp @@ -56,6 +56,7 @@ FluidCtrl FluidSynth::fluidCtrl[] = { }; static int NUM_CONTROLLER = sizeof(FluidSynth::fluidCtrl)/sizeof(*(FluidSynth::fluidCtrl)); +static void* fontLoadThread(void* t); QString *projPathPtr; // diff --git a/muse2/synti/fluidsynth/fluidsynti.h b/muse2/synti/fluidsynth/fluidsynti.h index c187798d..a7e4ebfc 100644 --- a/muse2/synti/fluidsynth/fluidsynti.h +++ b/muse2/synti/fluidsynth/fluidsynti.h @@ -147,5 +147,5 @@ struct FS_Helper //Only used to pass parameters when calling the loading thread int id; }; -static void* fontLoadThread(void* t); +// static void* fontLoadThread(void* t); // moved to the implementation file -Orcan #endif /* __MUSE_FLUIDSYNTI_H__ */ diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp index 13f1d3e2..82f1bd07 100644 --- a/muse2/synti/simpledrums2/simpledrums.cpp +++ b/muse2/synti/simpledrums2/simpledrums.cpp @@ -1329,7 +1329,7 @@ static void* loadSampleThread(void* p) //static Mess* instantiate(int sr, const char* name) -static Mess* instantiate(int sr, QWidget*, QString* projectPathPtr, const char* name) +static Mess* instantiate(int sr, QWidget*, QString* /*projectPathPtr*/, const char* name) { printf("SimpleSynth sampleRate %d\n", sr); SimpleSynth* synth = new SimpleSynth(sr); diff --git a/muse2/synti/simpledrums2/ssplugin.cpp b/muse2/synti/simpledrums2/ssplugin.cpp index 28639a39..2d8382e6 100644 --- a/muse2/synti/simpledrums2/ssplugin.cpp +++ b/muse2/synti/simpledrums2/ssplugin.cpp @@ -95,13 +95,13 @@ void SS_initPlugins() SS_TRACE_IN //loadPluginDir(museGlobalLib + QString("/plugins")); - char* ladspaPath = getenv("LADSPA_PATH"); + const char* ladspaPath = getenv("LADSPA_PATH"); if (ladspaPath == 0) ladspaPath = "/usr/lib/ladspa:/usr/local/lib/ladspa"; - char* p = ladspaPath; + const char* p = ladspaPath; while (*p != '\0') { - char* pe = p; + const char* pe = p; while (*pe != ':' && *pe != '\0') pe++; |