X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.C;h=1b00a0fb541dbbee3ebe88f2e87a64cc33a3aa3a;hb=128492e56ad719c2173a56379f423f6791f14906;hp=5e4dc7bd53560ca7a721d8814f754df314314b7b;hpb=b384d47608e07b9f5b6ce5fe1d0d76d9bda38202;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index 5e4dc7bd..1b00a0fb 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -56,6 +56,7 @@
 #include "pluginpopup.h"
 #include "pluginset.h"
 #include "preferences.h"
+#include "proxy.h"
 #include "record.h"
 #include "recordgui.h"
 #include "renderengine.h"
@@ -578,10 +579,9 @@ void MWindowGUI::update_patchbay()
 
 void MWindowGUI::update_proxy_toggle()
 {
-	int value = mwindow->edl->session->proxy_scale == 1 ? 1 : 0;
+	int value = mwindow->edl->session->proxy_state == PROXY_ACTIVE ? 0 : 1;
 	proxy_toggle->set_value(value);
-	if( mwindow->edl->session->proxy_scale == 1 &&
-	    mwindow->edl->session->proxy_disabled_scale == 1 )
+	if( mwindow->edl->session->proxy_state == PROXY_INACTIVE )
 		proxy_toggle->hide();
 	else
 		proxy_toggle->show();
@@ -1042,6 +1042,7 @@ void MWindowGUI::default_positions()
 	mwindow->cwindow->gui->unlock_window();
 	mwindow->awindow->gui->unlock_window();
 //printf("MWindowGUI::default_positions 2\n");
+	mwindow->tile_mixers();
 }
 
 
@@ -1089,20 +1090,23 @@ int MWindowGUI::keypress_event()
 
 	switch( get_keypress() ) {
 	case 'A':
-		if( !alt_down() && ctrl_down() ) {
+		if( !alt_down() ) {
+			if( !ctrl_down() || !shift_down() ) break;
 			mwindow->edl->tracks->clear_selected_edits();
 			draw_overlays(1);
 			result = 1;
-		}
-		break;
+			break;
+		} // fall thru
 	case 'a':
-		if( !ctrl_down() && alt_down() ) {
-			stop_transport("MWindowGUI::keypress_event 1");
-			mwindow->nearest_auto_keyframe(shift_down(),
-				!ctrl_down() ? PLAY_FORWARD : PLAY_REVERSE);
-			result = 1;
-		}
-		else if( ctrl_down() && alt_down() ) {
+		if( !alt_down() ) break;
+		stop_transport("MWindowGUI::keypress_event 1");
+		mwindow->nearest_auto_keyframe(shift_down(),
+			!ctrl_down() ? PLAY_FORWARD : PLAY_REVERSE);
+		result = 1;
+		break;
+
+	case '\'':
+		if( ctrl_down() && alt_down() ) {
 			mwindow->select_edits(1);
 			result = 1;
 		}
@@ -2414,12 +2418,12 @@ ProxyToggle::ProxyToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y)
  : BC_Toggle(x, y, ( !mwindow->edl->session->proxy_use_scaler ?
 			mwindow->theme->proxy_p_toggle :
 			mwindow->theme->proxy_s_toggle ),
-		mwindow->edl->session->proxy_disabled_scale != 1)
+		mwindow->edl->session->proxy_state == PROXY_DISABLED)
 {
 	this->mwindow = mwindow;
 	this->mbuttons = mbuttons;
 	scaler_images = mwindow->edl->session->proxy_use_scaler;
-	set_tooltip(mwindow->edl->session->proxy_disabled_scale==1 ?
+	set_tooltip(mwindow->edl->session->proxy_state!=PROXY_DISABLED ?
 		_("Disable proxy") : _("Enable proxy"));
 }
 
@@ -2455,6 +2459,12 @@ int ProxyToggle::handle_event()
 		mwindow->enable_proxy();
 	mwindow->gui->lock_window("ProxyToggle::handle_event");
 	set_tooltip(!disabled ? _("Disable proxy") : _("Enable proxy"));
+	ProxyDialog *dialog = mwindow->gui->mainmenu->proxy->dialog;
+	if( dialog && dialog->gui ) {
+		dialog->gui->lock_window("ProxyToggle::handle_event");
+		dialog->gui->update();
+		dialog->gui->unlock_window();
+	}
 	return 1;
 }