From 51aced51e2f148adee37a6c4d2d29f5f62ac0f07 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Thu, 3 Jul 2014 00:40:55 +0100
Subject: [PATCH] Update vestige header to latest ardour3 version

---
 source/includes/vestige/aeffectx.h | 46 ++++++++++++++----------------
 source/tests/CarlaUtils.cpp        |  1 +
 source/utils/CarlaVstUtils.hpp     |  5 ----
 3 files changed, 22 insertions(+), 30 deletions(-)
 mode change 100755 => 100644 source/includes/vestige/aeffectx.h

diff --git a/source/includes/vestige/aeffectx.h b/source/includes/vestige/aeffectx.h
old mode 100755
new mode 100644
index 0cbde1a1c..23f84f2e1
--- a/source/includes/vestige/aeffectx.h
+++ b/source/includes/vestige/aeffectx.h
@@ -2,7 +2,7 @@
  * aeffectx.h - simple header to allow VeSTige compilation and eventually work
  *
  * Copyright (c) 2006 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
- *
+ * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
  * This program is free software; you can redistribute it and/or
@@ -113,12 +113,11 @@
 #define kEffectMagic (CCONST( 'V', 's', 't', 'P' ))
 #define kVstLangEnglish 1
 #define kVstMidiType 1
-#define kVstTempoValid (1 << 10)
-#define kVstTransportPlaying (1 << 1)
-
 
 struct RemoteVstPlugin;
 
+#define kVstTransportPlaying (1 << 1)
+
 #define kVstNanosValid (1 << 8)
 #define kVstPpqPosValid (1 << 9)
 #define kVstTempoValid (1 << 10)
@@ -250,29 +249,26 @@ struct _AEffect
 
 typedef struct _AEffect AEffect;
 
-struct _VstTimeInfo
+typedef struct _VstTimeInfo
 {
-	// 00
-	double samplePos;
-	// 08
-	double sampleRate;
-	// unconfirmed 10 18
-	char empty1[8 + 8];
-	// 20?
-	double tempo;
-	// unconfirmed 28 30 38
-	char empty2[8 + 8 + 8];
-	// 40?
-	int timeSigNumerator;
-	// 44?
-	int timeSigDenominator;
-	// unconfirmed 48 4c 50
-	char empty3[4 + 4 + 4];
-	// 54
-	int flags;
-};
+    /* info from online documentation of VST provided by Steinberg */
+
+    double samplePos;
+    double sampleRate;
+    double nanoSeconds;
+    double ppqPos;
+    double tempo;
+    double barStartPos;
+    double cycleStartPos;
+    double cycleEndPos;
+    int32_t   timeSigNumerator;
+    int32_t   timeSigDenominator;
+    int32_t   smpteOffset;
+    int32_t   smpteFrameRate;
+    int32_t   samplesToNextClock;
+    int32_t   flags;
 
-typedef struct _VstTimeInfo VstTimeInfo;
+} VstTimeInfo;
 
 typedef intptr_t (* audioMasterCallback) (AEffect *, int32_t, int32_t, intptr_t, void *, float);
 
diff --git a/source/tests/CarlaUtils.cpp b/source/tests/CarlaUtils.cpp
index 1a00e0632..cc3f0c9b9 100644
--- a/source/tests/CarlaUtils.cpp
+++ b/source/tests/CarlaUtils.cpp
@@ -20,6 +20,7 @@
 #endif
 
 #define HAVE_JUCE
+#define VESTIGE_HEADER
 
 #include "CarlaUtils.hpp"
 #include "CarlaMathUtils.hpp"
diff --git a/source/utils/CarlaVstUtils.hpp b/source/utils/CarlaVstUtils.hpp
index 6bd05f488..8e0f17155 100644
--- a/source/utils/CarlaVstUtils.hpp
+++ b/source/utils/CarlaVstUtils.hpp
@@ -117,10 +117,6 @@
 struct ERect {
     int16_t top, left, bottom, right;
 };
-struct VstTimeInfo_R {
-    double samplePos, sampleRate, nanoSeconds, ppqPos, tempo, barStartPos, cycleStartPos, cycleEndPos;
-    int32_t timeSigNumerator, timeSigDenominator, smpteOffset, smpteFrameRate, samplesToNextClock, flags;
-};
 #else
 #ifndef CARLA_OS_MAC
 # undef TARGET_API_MAC_CARBON
@@ -129,7 +125,6 @@ struct VstTimeInfo_R {
 #undef VST_64BIT_PLATFORM
 #define VST_64BIT_PLATFORM (defined(_WIN64) || defined(__LP64__) || defined (_LP64))
 #include "vst/pluginterfaces/vst2.x/aeffectx.h"
-typedef VstTimeInfo VstTimeInfo_R;
 #endif
 
 // -----------------------------------------------------------------------