projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace spash/about bg img, fix transition strip, include olaf de.po+neophyte, update...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
pluginlv2gui.C
diff --git
a/cinelerra-5.1/cinelerra/pluginlv2gui.C
b/cinelerra-5.1/cinelerra/pluginlv2gui.C
index f6e3518fa1662ecbf74c1a97b3ad3d191874db78..fd9a6f51174b1a42fad30b5d5b61abd5ff713916 100644
(file)
--- a/
cinelerra-5.1/cinelerra/pluginlv2gui.C
+++ b/
cinelerra-5.1/cinelerra/pluginlv2gui.C
@@
-18,6
+18,7
@@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+#ifdef HAVE_LV2
#include "clip.h"
#include "cstrdup.h"
#include "clip.h"
#include "cstrdup.h"
@@
-211,12
+212,8
@@
void PluginLV2ClientWindow::create_objects()
BC_Title *title;
int x = 10, y = 10, x1;
add_subwindow(title = new BC_Title(x, y, client->title));
BC_Title *title;
int x = 10, y = 10, x1;
add_subwindow(title = new BC_Title(x, y, client->title));
-#ifdef HAVE_LV2UI
x1 = get_w() - BC_GenericButton::calculate_w(this, _("UI")) - 8;
x1 = get_w() - BC_GenericButton::calculate_w(this, _("UI")) - 8;
- add_subwindow(ui = new PluginLV2ClientUI(this, x1, y));
-#else
- ui = 0;
-#endif
+ add_subwindow(client_ui = new PluginLV2ClientUI(this, x1, y));
y += title->get_h() + 10;
add_subwindow(varbl = new BC_Title(x, y, ""));
add_subwindow(range = new BC_Title(x+160, y, ""));
y += title->get_h() + 10;
add_subwindow(varbl = new BC_Title(x, y, ""));
add_subwindow(range = new BC_Title(x+160, y, ""));
@@
-232,7
+229,6
@@
void PluginLV2ClientWindow::create_objects()
add_subwindow(slider = new PluginLV2ClientSlider(this, x1, y+10));
y += pot->get_h() + 10;
add_subwindow(slider = new PluginLV2ClientSlider(this, x1, y+10));
y += pot->get_h() + 10;
- client->init_lv2();
client->load_configuration();
client->config.update();
client->load_configuration();
client->config.update();
@@
-245,6
+241,7
@@
void PluginLV2ClientWindow::create_objects()
show_window(1);
if( client->server->mwindow->preferences->autostart_lv2ui ) {
show_window(1);
if( client->server->mwindow->preferences->autostart_lv2ui ) {
+ client_ui->disable();
PluginLV2ParentUI *ui = get_ui();
ui->show();
}
PluginLV2ParentUI *ui = get_ui();
ui->show();
}
@@
-253,10
+250,8
@@
void PluginLV2ClientWindow::create_objects()
int PluginLV2ClientWindow::resize_event(int w, int h)
{
int x1;
int PluginLV2ClientWindow::resize_event(int w, int h)
{
int x1;
-#ifdef HAVE_LV2UI
- x1 = w - ui->get_w() - 8;
- ui->reposition_window(x1, ui->get_y());
-#endif
+ x1 = w - client_ui->get_w() - 8;
+ client_ui->reposition_window(x1, client_ui->get_y());
x1 = w - reset->get_w() - 8;
reset->reposition_window(x1, reset->get_y());
x1 = w - apply->get_w() - 8;
x1 = w - reset->get_w() - 8;
reset->reposition_window(x1, reset->get_y());
x1 = w - apply->get_w() - 8;
@@
-360,3
+355,11
@@
void PluginLV2ClientWindow::lv2_set(int idx, float val)
lv2_update();
}
lv2_update();
}
+void PluginLV2ClientWindow::lv2_ui_enable()
+{
+ lock_window("PluginLV2ClientWindow::lv2_update");
+ client_ui->enable();
+ unlock_window();
+}
+
+#endif