From 569bf2f27e3be18499a9e5b78a56fda7e7d200c7 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Wed, 23 Nov 2011 19:29:38 +0000
Subject: Remove VST current_program variable, since that stuff is managed by
 the presets code in Plugin.

git-svn-id: svn://localhost/ardour2/branches/3.0@10801 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/vstfxwin.cc        |  3 ---
 libs/ardour/ardour/vst_types.h |  1 -
 libs/ardour/vst_plugin.cc      | 16 ----------------
 libs/ardour/vstfx.cc           |  1 -
 libs/fst/vstwin.c              |  3 ---
 5 files changed, 24 deletions(-)

diff --git a/gtk2_ardour/vstfxwin.cc b/gtk2_ardour/vstfxwin.cc
index c8c11a1809..eecfb0dc82 100755
--- a/gtk2_ardour/vstfxwin.cc
+++ b/gtk2_ardour/vstfxwin.cc
@@ -407,9 +407,6 @@ again:
 						vstfx->plugin->dispatcher (vstfx->plugin, 68 /* effEndSetProgram */, 0, 0, NULL, 0);
 					}
 					
-					/* did it work? */
-					
-					vstfx->current_program = vstfx->plugin->dispatcher (vstfx->plugin, 3, /* effGetProgram */ 0, 0, NULL, 0);
 					vstfx->want_program = -1; 
 				}
 				
diff --git a/libs/ardour/ardour/vst_types.h b/libs/ardour/ardour/vst_types.h
index 0d6f8c397f..d185d62606 100644
--- a/libs/ardour/ardour/vst_types.h
+++ b/libs/ardour/ardour/vst_types.h
@@ -104,7 +104,6 @@ struct _VSTState
 	int	    n_pending_keys;
 	unsigned char * wanted_chunk;
 	int 	    wanted_chunk_size;
-	int	    current_program;
 	float *     want_params;
 	float *     set_params;
 	
diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index 26212ba03d..130c43ede6 100644
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -145,12 +145,6 @@ VSTPlugin::add_state (XMLNode* root) const
 {
 	LocaleGuard lg (X_("POSIX"));
 
-	if (_state->current_program != -1) {
-		char buf[32];
-		snprintf (buf, sizeof (buf), "%d", _state->current_program);
-		root->add_property ("current-program", buf);
-	}
-
 	if (_plugin->flags & 32 /* effFlagsProgramsChunks */) {
 
 		gchar* data = get_chunk (false);
@@ -193,12 +187,6 @@ VSTPlugin::set_state (const XMLNode& node, int version)
 		return 0;
 	}
 
-	const XMLProperty* prop;
-
-	if ((prop = node.property ("current-program")) != 0) {
-		_state->want_program = atoi (prop->value().c_str());
-	}
-
 	XMLNode* child;
 	int ret = -1;
 
@@ -230,10 +218,6 @@ VSTPlugin::set_state (const XMLNode& node, int version)
 			_plugin->setParameter (_plugin, param, val);
 		}
 
-		/* program number is not knowable */
-
-		_state->current_program = -1;
-
 		ret = 0;
 
 	}
diff --git a/libs/ardour/vstfx.cc b/libs/ardour/vstfx.cc
index 4cff1deb25..5046afb737 100755
--- a/libs/ardour/vstfx.cc
+++ b/libs/ardour/vstfx.cc
@@ -69,7 +69,6 @@ vstfx_new ()
 	
 	vstfx->want_program = -1;
 	vstfx->want_chunk = 0;
-	vstfx->current_program = -1;
 	vstfx->n_pending_keys = 0;
 	vstfx->has_editor = 0;
 	vstfx->program_set_without_editor = 0;
diff --git a/libs/fst/vstwin.c b/libs/fst/vstwin.c
index e1132e5d94..67ae03986e 100644
--- a/libs/fst/vstwin.c
+++ b/libs/fst/vstwin.c
@@ -74,7 +74,6 @@ fst_new ()
 	pthread_cond_init (&fst->plugin_dispatcher_called, NULL);
 	fst->want_program = -1;
 	fst->want_chunk = 0;
-	fst->current_program = -1;
 	fst->n_pending_keys = 0;
 	fst->has_editor = 0;
 	fst->program_set_without_editor = 0;
@@ -101,8 +100,6 @@ maybe_set_program (VSTState* fst)
 		if (fst->vst_version >= 2) {
 			fst->plugin->dispatcher (fst->plugin, 68 /* effEndSetProgram */, 0, 0, NULL, 0);
 		}
-		/* did it work? */
-		fst->current_program = fst->plugin->dispatcher (fst->plugin, 3, /* effGetProgram */ 0, 0, NULL, 0);
 		fst->want_program = -1; 
 	}
 	
-- 
cgit v1.2.3