X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.C;h=566afd6c27d12f21d96c12c8fee2540b0fe6b7fe;hb=803cf48f8f7ee246eb5473e55fc2125e8b398250;hp=41882647b751236b77e618d89e21328544cb0d78;hpb=3ac8199743f244669cc87ceef9c3cd23710552f3;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index 41882647..566afd6c 100644
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -916,16 +916,19 @@ int MWindowGUI::visible(int64_t x1, int64_t x2, int64_t view_x1, int64_t view_x2
 
 void MWindowGUI::show_message(const char *message, int color)
 {
-	statusbar->set_message(message, color);
+	statusbar->show_message(message, color);
 }
-void MWindowGUI::set_default_message(const char *message)
+
+void MWindowGUI::update_default_message()
 {
-	statusbar->set_default_message(message);
+	statusbar->update_default_message();
 }
+
 void MWindowGUI::reset_default_message()
 {
 	statusbar->reset_default_message();
 }
+
 void MWindowGUI::default_message()
 {
 	statusbar->default_message();
@@ -1036,7 +1039,7 @@ int MWindowGUI::drag_stop()
 	}
 
 
-//printf("TrackCanvas::drag_stop %d %d\n", redraw, mwindow->session->current_operation);
+//printf("MWindowGUI::drag_stop %d %d\n", redraw, mwindow->session->current_operation);
 	if(redraw)
 	{
 		mwindow->edl->tracks->update_y_pixels(mwindow->theme);
@@ -1159,12 +1162,22 @@ int MWindowGUI::keypress_event()
 	int result = mbuttons->keypress_event();
 	if( result ) return result;
 
+	Track *this_track = 0;
+
 	switch(get_keypress()) {
 	case 'e':
 		mwindow->toggle_editing_mode();
 		result = 1;
 		break;
 
+	case 'k': case 'K':
+		if( alt_down() ) break;
+		stop_transport("MWindowGUI::keypress_event 1");
+		mwindow->nearest_plugin_keyframe(shift_down(),
+			!ctrl_down() ? PLAY_FORWARD : PLAY_REVERSE);
+		result = 1;
+		break;
+
 	case '1': case '2': case '3': case '4':
 	case '5': case '6': case '7': case '8':
 		if( !alt_down() || shift_down() ) break;
@@ -1175,9 +1188,7 @@ int MWindowGUI::keypress_event()
 	case LEFT:
 		if( !ctrl_down() ) {
 			if( alt_down() ) {
-				unlock_window();
-				mbuttons->transport->handle_transport(STOP, 1, 0, 0);
-				lock_window("MWindowGUI::keypress_event 1");
+				stop_transport("MWindowGUI::keypress_event 1");
 				mwindow->prev_edit_handle(shift_down());
 			}
 			else
@@ -1186,12 +1197,17 @@ int MWindowGUI::keypress_event()
 		}
 		break;
 
+	case ',':
+		if( !ctrl_down() && !alt_down() ) {
+			mwindow->move_left();
+			result = 1;
+		}
+		break;
+
 	case RIGHT:
 		if( !ctrl_down() ) {
 			if( alt_down() ) {
-				unlock_window();
-				mbuttons->transport->handle_transport(STOP, 1, 0, 0);
-				lock_window("MWindowGUI::keypress_event 2");
+				stop_transport("MWindowGUI::keypress_event 2");
 				mwindow->next_edit_handle(shift_down());
 			}
 			else
@@ -1200,6 +1216,13 @@ int MWindowGUI::keypress_event()
 		}
 		break;
 
+	case '.':
+		if( !ctrl_down() && !alt_down() ) {
+			mwindow->move_right();
+			result = 1;
+		}
+		break;
+
 	case UP:
 		if( ctrl_down() && !alt_down() )
 			mwindow->expand_y();
@@ -1242,7 +1265,6 @@ int MWindowGUI::keypress_event()
 
 	case TAB:
 	case LEFTTAB:
-		Track *this_track = 0;
 		for( int i=0; i<TOTAL_PANES; ++i ) {
 			if( !pane[i] ) continue;
 			if( (this_track = pane[i]->over_track()) != 0 ) break;
@@ -1266,10 +1288,25 @@ int MWindowGUI::keypress_event()
 		update(0, 1, 0, 0, 1, 0, 1);
 		unlock_window();
 		mwindow->cwindow->update(0, 1, 1);
-		lock_window("TrackCanvas::keypress_event 3");
+		lock_window("MWindowGUI::keypress_event 3");
 
 		result = 1;
 		break;
+
+	case KEY_F1:
+	case KEY_F2:
+	case KEY_F3:
+	case KEY_F4:
+	case KEY_F5:
+	case KEY_F6:
+	case KEY_F7:
+	case KEY_F8:
+	case KEY_F9:
+	case KEY_F10:
+	case KEY_F11:
+	case KEY_F12:
+		resend_event(mwindow->cwindow->gui);
+		return 1;
 	}
 
 // since things under cursor have changed...
@@ -2233,6 +2270,32 @@ void MWindowGUI::draw_trackmovement()
 }
 
 
+void MWindowGUI::update_mixers(Track *track, int v)
+{
+	for( int i=0; i<TOTAL_PANES;  ++i ) {
+		if( !pane[i] ) continue;
+		PatchBay *patchbay = pane[i]->patchbay;
+		if( !patchbay ) continue;
+		for( int j=0; j<patchbay->patches.total; ++j ) {
+			PatchGUI *patchgui = patchbay->patches.values[j];
+			if( !patchgui->mix ) continue;
+			if( !track || patchgui->track == track ) {
+				patchgui->mix->update(v>=0 ? v :
+					mwindow->mixer_track_active(patchgui->track));
+			}
+		}
+	}
+}
+
+void MWindowGUI::stop_transport(const char *lock_msg)
+{
+	if( !mbuttons->transport->is_stopped() ) {
+		if( lock_msg ) unlock_window();
+		mbuttons->transport->handle_transport(STOP, 1, 0, 0);
+		if( lock_msg ) lock_window(lock_msg);
+	}
+}
+
 PaneButton::PaneButton(MWindow *mwindow, int x, int y)
  : BC_Button(x, y, mwindow->theme->get_image_set("pane"))
 {
@@ -2267,7 +2330,8 @@ int PaneButton::cursor_motion_event()
 
 int PaneButton::button_release_event()
 {
-	mwindow->gui->stop_pane_drag();
+	if( get_buttonpress() != WHEEL_DOWN && get_buttonpress() != WHEEL_UP )
+		mwindow->gui->stop_pane_drag();
 	int result = BC_Button::button_release_event();
 	return result;
 }