Merge branch 'master' into cairocanvas

gtk2_ardour/about.cc

@@ -132,7 +132,6 @@ static const char* authors[] = {
 	N_("Sam Chessman"),
 	N_("André Colomb"),
 	N_("Paul Davis"),
-	N_("Julien Dekozak"),
 	N_("Gerard van Dongen"),
 	N_("Colin Fletcher"),
 	N_("Dave Flick"),
@@ -151,6 +150,7 @@ static const char* authors[] = {
 	N_("Robert Jordens"),
 	N_("Stefan Kersten"),
 	N_("Armand Klenk"),
+	N_("Julien de Kozak"),
 	N_("Matt Krai"),
 	N_("Nick Lanham"),
 	N_("Colin Law"),

libs/ardour/ardour/vst_plugin.h

@@ -73,6 +73,7 @@ public:
 	
 	AEffect * plugin () const { return _plugin; }
 	VSTState * state () const { return _state; }
+        void set_state (VSTState* s) { _state = s; }
 
 	int set_state (XMLNode const &, int);
 

libs/ardour/linux_vst_support.cc

@@ -34,6 +34,8 @@
 #include <glibmm/fileutils.h>
 
 #include "ardour/linux_vst_support.h"
+#include "ardour/vst_plugin.h"
+
 #include "pbd/basename.h"
 #include "pbd/error.h"
 
@@ -293,36 +295,43 @@ vstfx_unload (VSTHandle* fhandle)
 	return 0;
 }
 
-/*This instantiates a plugin*/
+/**
+   Instantiates a VST plugin and also set _state of its plugin argument 
+ */
 
-VSTState *
-vstfx_instantiate (VSTHandle* fhandle, audioMasterCallback amc, void* userptr)
+VSTState*
+vstfx_instantiate (VSTHandle* fhandle, audioMasterCallback amc, void *ptr)
 {
 	VSTState* vstfx = vstfx_new ();
+	ARDOUR::VSTPlugin* plugin = reinterpret_cast<ARDOUR::VSTPlugin*> (ptr);
 
-	if(fhandle == 0)
-	{
+	if (fhandle == 0) {
 	    vstfx_error( "** ERROR ** VSTFX : The handle was 0\n" );
 	    return 0;
 	}
 
-	if ((vstfx->plugin = fhandle->main_entry (amc)) == 0) 
-	{
+	if ((vstfx->plugin = fhandle->main_entry (amc)) == 0) {
 		vstfx_error ("** ERROR ** VSTFX : %s could not be instantiated :(\n", fhandle->name);
 		free (vstfx);
 		return 0;
 	}
 	
 	vstfx->handle = fhandle;
-	vstfx->plugin->user = userptr;
+	vstfx->plugin->user = plugin;
 		
-	if (vstfx->plugin->magic != kEffectMagic)
-	{
+	if (vstfx->plugin->magic != kEffectMagic) {
 		vstfx_error ("** ERROR ** VSTFX : %s is not a VST plugin\n", fhandle->name);
 		free (vstfx);
 		return 0;
 	}
+
+	/* need to set this here because some plugins make audioMaster
+	 * callbacks from within effOpen, and _state must be set for
+	 * that to work.
+	 */
 	
+	plugin->set_state (vstfx);
+
 	vstfx->plugin->dispatcher (vstfx->plugin, effOpen, 0, 0, 0, 0);
 	
 	/*May or May not need to 'switch the plugin on' here - unlikely

libs/ardour/lxvst_plugin.cc

@@ -32,7 +32,7 @@ LXVSTPlugin::LXVSTPlugin (AudioEngine& e, Session& session, VSTHandle* h)
 {
 	/* Instantiate the plugin and return a VSTState* */
 
-	if ((_state = vstfx_instantiate (_handle, Session::vst_callback, this)) == 0) {
+	if (vstfx_instantiate (_handle, Session::vst_callback, this) == 0) {
 		throw failed_constructor();
 	}
 
@@ -44,7 +44,7 @@ LXVSTPlugin::LXVSTPlugin (const LXVSTPlugin &other)
 {
 	_handle = other._handle;
 
-	if ((_state = vstfx_instantiate (_handle, Session::vst_callback, this)) == 0) {
+	if (vstfx_instantiate (_handle, Session::vst_callback, this) == 0) {
 		throw failed_constructor();
 	}
 	_plugin = _state->plugin;

libs/gtkmm2ext/po/cs.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-20 10:09+0100\n"
+"POT-Creation-Date: 2013-04-09 09:28-0400\n"
 "PO-Revision-Date: 2013-02-22 21:09+0100\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -80,7 +80,8 @@ msgid "Unknown"
 msgstr "Neznámý"
 
 #: keyboard.cc:534
-msgid "Ardour key bindings file not found at \"%1\" or contains errors."
+#, fuzzy
+msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 "Soubor s přiřazením kláves pro Ardour \"%1\"se nepodařilo najít, nebo "
 "obsahuje chyby."
@@ -96,5 +97,3 @@ msgstr "Klepněte pro ukotvení do hlavního okna"
 #: textviewer.cc:34
 msgid "Close"
 msgstr "Zavřít"
-
-