DPF

commit d362fed0020b0ba78b452b709b7e9ebb1334c2f8
parent b574386cede7cf1081939dc62f2e48513a31ef78
Author: falkTX <falktx@gmail.com>
Date:   Sat, 11 Oct 2014 11:40:49 +0100

Fix some warnings

Diffstat:
M
dgl/Makefile
 | 
5
+----
M
dgl/src/Geometry.cpp
 | 
2
+-
M
dgl/src/Window.cpp
 | 
2
++
D
dgl/src/Window.mm
 | 
17
-----------------
M
distrho/src/DistrhoPluginLV2.cpp
 | 
3
+++
M
distrho/src/DistrhoPluginVST.cpp
 | 
14
++++++++------

6 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/dgl/Makefile b/dgl/Makefile
@@ -63,10 +63,7 @@ all: $(TARGET)
 %.cpp.o: %.cpp
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.m.o: %.m
-	$(CC) $< $(BUILD_C_FLAGS) -ObjC -c -o $@
-
-%.mm.o: %.mm
+%.mm.o: %.cpp
 	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
 # --------------------------------------------------------------
diff --git a/dgl/src/Geometry.cpp b/dgl/src/Geometry.cpp
@@ -629,7 +629,7 @@ void Circle<T>::_draw(const bool isOutline)
 
     glBegin(isOutline ? GL_LINE_LOOP : GL_POLYGON);
 
-    for (int i=0; i<fNumSegments; ++i)
+    for (uint i=0; i<fNumSegments; ++i)
     {
         glVertex2f(x + fPos.fX, y + fPos.fY);
 
diff --git a/dgl/src/Window.cpp b/dgl/src/Window.cpp
@@ -887,6 +887,8 @@ Window::Window(App& app, intptr_t parentId)
     : pData(new PrivateData(app, this))
 {
     show();
+    // unused
+    return; (void)parentId;
 }
 #endif
 
diff --git a/dgl/src/Window.mm b/dgl/src/Window.mm
@@ -1,17 +0,0 @@
-/*
- * DISTRHO Plugin Framework (DPF)
- * Copyright (C) 2012-2014 Filipe Coelho <falktx@falktx.com>
- *
- * Permission to use, copy, modify, and/or distribute this software for any purpose with
- * or without fee is hereby granted, provided that the above copyright notice and this
- * permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "Window.cpp"
diff --git a/distrho/src/DistrhoPluginLV2.cpp b/distrho/src/DistrhoPluginLV2.cpp
@@ -127,6 +127,9 @@ public:
         {
             fNeededUiSends = nullptr;
         }
+#else
+        // unused
+        (void)fWorker;
 #endif
 
 #if DISTRHO_PLUGIN_WANT_TIMEPOS
diff --git a/distrho/src/DistrhoPluginVST.cpp b/distrho/src/DistrhoPluginVST.cpp
@@ -569,25 +569,27 @@ public:
             break;
 
         case effCanDo:
+#if DISTRHO_PLUGIN_HAS_MIDI_INPUT || DISTRHO_PLUGIN_HAS_MIDI_OUTPUT || DISTRHO_PLUGIN_WANT_TIMEPOS
             if (const char* const canDo = (const char*)ptr)
             {
-#if DISTRHO_PLUGIN_HAS_MIDI_INPUT
+# if DISTRHO_PLUGIN_HAS_MIDI_INPUT
                 if (std::strcmp(canDo, "receiveVstEvents") == 0)
                     return 1;
                 if (std::strcmp(canDo, "receiveVstMidiEvent") == 0)
                     return 1;
-#endif
-#if DISTRHO_PLUGIN_HAS_MIDI_OUTPUT
+# endif
+# if DISTRHO_PLUGIN_HAS_MIDI_OUTPUT
                 if (std::strcmp(canDo, "sendVstEvents") == 0)
                     return 1;
                 if (std::strcmp(canDo, "sendVstMidiEvent") == 0)
                     return 1;
-#endif
-#if DISTRHO_PLUGIN_WANT_TIMEPOS
+# endif
+# if DISTRHO_PLUGIN_WANT_TIMEPOS
                 if (std::strcmp(canDo, "receiveVstTimeInfo") == 0)
                     return 1;
-#endif
+# endif
             }
+#endif
             break;
 
         //case effStartProcess: