From d7b38512b8e0400e53a28708fd0e7da1188ad7ba Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Tue, 22 Nov 2011 00:15:46 +0000
Subject: Remove VESTIGE_HEADER stuff since we will always use it.

git-svn-id: svn://localhost/ardour2/branches/3.0@10755 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/vstfx.h        | 4 ----
 libs/ardour/lxvst_plugin.cc       | 4 ----
 libs/ardour/windows_vst_plugin.cc | 8 --------
 libs/fst/fst.h                    | 4 ----
 libs/fst/fstinfofile.c            | 4 ----
 5 files changed, 24 deletions(-)

(limited to 'libs')

diff --git a/libs/ardour/ardour/vstfx.h b/libs/ardour/ardour/vstfx.h
index decfd571de..33cac1d1ca 100755
--- a/libs/ardour/ardour/vstfx.h
+++ b/libs/ardour/ardour/vstfx.h
@@ -18,10 +18,6 @@ void vstfx_set_error_function (void (*func)(const char *));
 
 void  vstfx_error (const char *fmt, ...);
 
-/*We will use the vestige headers*/
-
-#define VESTIGE_HEADER
-
 #include <ardour/vestige/aeffectx.h>
 
 typedef struct _VSTFX VSTFX;
diff --git a/libs/ardour/lxvst_plugin.cc b/libs/ardour/lxvst_plugin.cc
index 7202134b77..6f4cb557e3 100755
--- a/libs/ardour/lxvst_plugin.cc
+++ b/libs/ardour/lxvst_plugin.cc
@@ -499,11 +499,7 @@ LXVSTPlugin::signal_latency () const
 		return _user_latency;
 	}
 
-#ifdef VESTIGE_HEADER
 	return *((int32_t *) (((char *) &_plugin->flags) + 12)); /* initialDelay */
-#else
-	return _plugin->initial_delay;
-#endif
 }
 
 set<Evoral::Parameter> 
diff --git a/libs/ardour/windows_vst_plugin.cc b/libs/ardour/windows_vst_plugin.cc
index a165dce390..8e94fd6b3a 100644
--- a/libs/ardour/windows_vst_plugin.cc
+++ b/libs/ardour/windows_vst_plugin.cc
@@ -543,11 +543,7 @@ WindowsVSTPlugin::signal_latency () const
 		return _user_latency;
 	}
 
-#ifdef VESTIGE_HEADER
         return *((framecnt_t *) (((char *) &_plugin->flags) + 12)); /* initialDelay */
-#else
-	return _plugin->initial_delay;
-#endif
 }
 
 set<Evoral::Parameter>
@@ -623,11 +619,7 @@ WindowsVSTPlugin::unique_id() const
 {
 	char buf[32];
 
-#ifdef VESTIGE_HEADER
        snprintf (buf, sizeof (buf), "%d", *((int32_t*) &_plugin->unused_id));
-#else
-       snprintf (buf, sizeof (buf), "%d", _plugin->uniqueID);
-#endif
        return string (buf);
 }
 
diff --git a/libs/fst/fst.h b/libs/fst/fst.h
index 86a43ba8d8..15ba72d66f 100644
--- a/libs/fst/fst.h
+++ b/libs/fst/fst.h
@@ -27,11 +27,7 @@ void fst_set_error_function (void (*func)(const char *));
 
 void  fst_error (const char *fmt, ...);
 
-#define VESTIGE_HEADER
-
-#ifdef VESTIGE_HEADER
 #include <vestige/aeffectx.h>
-#endif
 
 typedef struct _FST FST;
 typedef struct _FSTHandle FSTHandle;
diff --git a/libs/fst/fstinfofile.c b/libs/fst/fstinfofile.c
index c7061cd6b8..f8f09cd624 100644
--- a/libs/fst/fstinfofile.c
+++ b/libs/fst/fstinfofile.c
@@ -184,11 +184,7 @@ static FSTInfo *fst_info_from_plugin( FST *fst ) {
       info->creator = strdup (creator);
     }
 
-#ifdef VESTIGE_HEADER
     info->UniqueID = *((int32_t *) &plugin->unused_id);
-#else
-    info->UniqueID = plugin->uniqueID;
-#endif
 
     info->Category = strdup( "None" );          // FIXME:  
     info->numInputs = plugin->numInputs;
-- 
cgit v1.2.3