From 1d598e38b9a8d45f1043cdc3dd9e353e5ec20962 Mon Sep 17 00:00:00 2001
From: Julian Storer <jules@BigMac.local>
Date: Fri, 19 Feb 2010 09:22:13 +0000
Subject: [PATCH] Updates to plugin host code.

---
 .../Source/GraphEditorPanel.cpp                 | 17 ++++++-----------
 .../audio plugin host/Source/MainHostWindow.cpp |  6 ++++--
 .../audio_file_formats/juce_WavAudioFormat.cpp  |  2 +-
 .../plugins/formats/juce_VSTPluginFormat.cpp    | 12 +++++-------
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/extras/audio plugin host/Source/GraphEditorPanel.cpp b/extras/audio plugin host/Source/GraphEditorPanel.cpp
index d077865e26..4e579ee593 100644
--- a/extras/audio plugin host/Source/GraphEditorPanel.cpp	
+++ b/extras/audio plugin host/Source/GraphEditorPanel.cpp	
@@ -221,8 +221,6 @@ public:
           numInputs (0),
           numOutputs (0),
           pinSize (16),
-          originalX (0),
-          originalY (0),
           font (13.0f, Font::bold),
           numIns (0),
           numOuts (0)
@@ -240,9 +238,7 @@ public:
 
     void mouseDown (const MouseEvent& e)
     {
-        originalX = 0;
-        originalY = 0;
-        relativePositionToGlobal (originalX, originalY);
+        originalPos = relativePositionToGlobal (Point<int>());
 
         toFront (true);
 
@@ -285,15 +281,14 @@ public:
     {
         if (! e.mods.isPopupMenu())
         {
-            int x = originalX + e.getDistanceFromDragStartX();
-            int y = originalY + e.getDistanceFromDragStartY();
+            Point<int> pos (originalPos + Point<int> (e.getDistanceFromDragStartX(), e.getDistanceFromDragStartY()));
 
             if (getParentComponent() != 0)
-                getParentComponent()->globalPositionToRelative (x, y);
+                pos = getParentComponent()->globalPositionToRelative (pos);
 
             graph.setNodePosition (filterID,
-                                   (x + getWidth() / 2) / (double) getParentWidth(),
-                                   (y + getHeight() / 2) / (double) getParentHeight());
+                                   (pos.getX() + getWidth() / 2) / (double) getParentWidth(),
+                                   (pos.getY() + getHeight() / 2) / (double) getParentHeight());
 
             getGraphPanel()->updateComponents();
         }
@@ -450,7 +445,7 @@ public:
 
 private:
     int pinSize;
-    int originalX, originalY;
+    Point<int> originalPos;
     int numIns, numOuts;
     DropShadowEffect shadow;
     Font font;
diff --git a/extras/audio plugin host/Source/MainHostWindow.cpp b/extras/audio plugin host/Source/MainHostWindow.cpp
index c25ee1d1c8..203f068f1e 100644
--- a/extras/audio plugin host/Source/MainHostWindow.cpp	
+++ b/extras/audio plugin host/Source/MainHostWindow.cpp	
@@ -495,11 +495,13 @@ void MainHostWindow::filesDropped (const StringArray& files, int x, int y)
         knownPluginList.scanAndAddDragAndDroppedFiles (files, typesFound);
 
         GraphDocumentComponent* const graphEditor = getGraphEditor();
+
+        Point<int> pos (x, y);
         if (graphEditor != 0)
-            relativePositionToOtherComponent (graphEditor, x, y);
+            pos = relativePositionToOtherComponent (graphEditor, pos);
 
         for (int i = 0; i < jmin (5, typesFound.size()); ++i)
-            createPlugin (typesFound.getUnchecked(i), x, y);
+            createPlugin (typesFound.getUnchecked(i), pos.getX(), pos.getY());
     }
 }
 
diff --git a/src/audio/audio_file_formats/juce_WavAudioFormat.cpp b/src/audio/audio_file_formats/juce_WavAudioFormat.cpp
index 716ca972d3..50f423372d 100644
--- a/src/audio/audio_file_formats/juce_WavAudioFormat.cpp
+++ b/src/audio/audio_file_formats/juce_WavAudioFormat.cpp
@@ -656,7 +656,7 @@ class WavAudioFormatWriter  : public AudioFormatWriter
         if (smplChunk.getSize() > 0)
         {
             output->writeInt (chunkName ("smpl"));
-            output->writeInt (smplChunk.getSize());
+            output->writeInt ((int) smplChunk.getSize());
             output->write (smplChunk.getData(), (int) smplChunk.getSize());
         }
 
diff --git a/src/audio/plugins/formats/juce_VSTPluginFormat.cpp b/src/audio/plugins/formats/juce_VSTPluginFormat.cpp
index 8c5284a4e4..8cf82c6c30 100644
--- a/src/audio/plugins/formats/juce_VSTPluginFormat.cpp
+++ b/src/audio/plugins/formats/juce_VSTPluginFormat.cpp
@@ -1218,19 +1218,18 @@ public:
 
         if (topComp->getPeer() != 0)
         {
-            int x = 0, y = 0;
-            relativePositionToOtherComponent (topComp, x, y);
+            const Point<int> pos (relativePositionToOtherComponent (topComp, Point<int>()));
 
             recursiveResize = true;
 
 #if JUCE_WIN32
             if (pluginHWND != 0)
-                MoveWindow (pluginHWND, x, y, getWidth(), getHeight(), TRUE);
+                MoveWindow (pluginHWND, pos.getX(), pos.getY(), getWidth(), getHeight(), TRUE);
 #elif JUCE_LINUX
             if (pluginWindow != 0)
             {
                 XResizeWindow (display, pluginWindow, getWidth(), getHeight());
-                XMoveWindow (display, pluginWindow, x, y);
+                XMoveWindow (display, pluginWindow, pos.getX(), pos.getY());
                 XMapRaised (display, pluginWindow);
             }
 #endif
@@ -1289,9 +1288,8 @@ public:
 
             if (peer != 0)
             {
-                peer->addMaskedRegion (getScreenX() - peer->getScreenX(),
-                                       getScreenY() - peer->getScreenY(),
-                                       getWidth(), getHeight());
+                const Point<int> pos (getScreenPosition() - peer->getScreenPosition());
+                peer->addMaskedRegion (pos.getX(), pos.getY(), getWidth(), getHeight());
 
 #if JUCE_LINUX
                 if (pluginWindow != 0)