summaryrefslogtreecommitdiff
path: root/muse2/synti/fluidsynth
diff options
context:
space:
mode:
authorOrcan Ogetbil <oget.fedora@gmail.com>2010-12-09 18:30:17 +0000
committerOrcan Ogetbil <oget.fedora@gmail.com>2010-12-09 18:30:17 +0000
commit9f1903d96cccc7cb2f456d68d31446fa739905f7 (patch)
tree1c30a654f041dbb7614a2f8d64243b2e40336e0a /muse2/synti/fluidsynth
parent703f47458a859c9559c13038246dd37529eba6ff (diff)
Fix compiler warnings, and a typo in the transport max slider value.
Diffstat (limited to 'muse2/synti/fluidsynth')
-rw-r--r--muse2/synti/fluidsynth/fluidsynti.cpp1
-rw-r--r--muse2/synti/fluidsynth/fluidsynti.h2
2 files changed, 2 insertions, 1 deletions
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__ */