zynaddsubfx

commit cacc27eb61e08e6a4698ed03a2d605d3b6178457
parent 23362254981dfd2d3dc40828350675807673dd5a
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Fri, 12 Mar 2010 13:51:33 -0500

Nio: Reducing compiler warnings

Diffstat:
M
src/Misc/Master.cpp
 | 
2
++
M
src/Misc/Master.h
 | 
1
-
M
src/Nio/InMgr.cpp
 | 
1
+
M
src/Nio/OutMgr.cpp
 | 
2
++
M
src/Nio/WavEngine.h
 | 
2
+-

5 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/Misc/Master.cpp b/src/Misc/Master.cpp
@@ -21,6 +21,8 @@
 
 */
 
+#warning TODO move Sequencer out of master
+
 #include "Master.h"
 
 #include "../Params/LFOParams.h"
diff --git a/src/Misc/Master.h b/src/Misc/Master.h
@@ -148,7 +148,6 @@ class Master
         int swaplr; //1 if L and R are swapped
 
         //Sequencer
-#warning TODO move Sequencer out of master
         Sequencer seq;
 
         //other objects
diff --git a/src/Nio/InMgr.cpp b/src/Nio/InMgr.cpp
@@ -119,5 +119,6 @@ string InMgr::getSource() const
         if(in && in->getMidiEn())
             return in->name;
     }
+    return "ERROR";
 }
 
diff --git a/src/Nio/OutMgr.cpp b/src/Nio/OutMgr.cpp
@@ -98,6 +98,7 @@ string OutMgr::getDriver() const
         if(out && out->getAudioEn())
             return out->name;
     }
+    return "ERROR";
 }
 
 bool OutMgr::setDriver(string name)
@@ -198,5 +199,6 @@ string OutMgr::getSink() const
         if(out && out->getAudioEn())
             return out->name;
     }
+    return "ERROR";
 }
 
diff --git a/src/Nio/WavEngine.h b/src/Nio/WavEngine.h
@@ -39,7 +39,7 @@ class WavEngine: public AudioOut
         void Stop();
 
         void setAudioEn(bool nval){};
-        bool getAudioEn() const{};
+        bool getAudioEn() const{return true;};
 
     protected:
         void *AudioThread();