X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpatchgui.C;h=72211d1ac4c1036713e34aff0079caeb9827dd0b;hb=2ba7e9962ea989863e152373e96a09b00a0b4eb8;hp=51e47ba19699aac93be332b0de61190529fdc44e;hpb=394f84fcbfbb6fc97758f09cfcf5319da036b8cd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/patchgui.C b/cinelerra-5.1/cinelerra/patchgui.C
index 51e47ba1..72211d1a 100644
--- a/cinelerra-5.1/cinelerra/patchgui.C
+++ b/cinelerra-5.1/cinelerra/patchgui.C
@@ -199,7 +199,7 @@ int PatchGUI::update(int x, int y)
 			record->update(track->record);
 			gang->update(track->gang);
 			draw->update(track->draw);
-			mute->update(mute->get_keyframe(mwindow, this)->value);
+			mute->update(mwindow->get_int_auto(this, AUTOMATION_MUTE)->value);
 			expand->update(track->expand_view);
 		}
 	}
@@ -237,29 +237,17 @@ void PatchGUI::toggle_behavior(int type,
 		BC_Toggle *toggle,
 		int *output)
 {
-	if(toggle->shift_down())
-	{
+	if(toggle->shift_down()) {
+		int sense = type != Tracks::MUTE ? 1 : 0;
 		// all selected if nothing previously selected or
 		// if this patch was previously the only one selected
-		switch( type ) {
-		case Tracks::MUTE: {  // negative logic for normally off
-			int total_selected = mwindow->edl->tracks->total() -
-				mwindow->edl->tracks->total_of(type);
-			int current_output = *output;
-			int selected = !total_selected || (total_selected == 1 &&
-				 !current_output ) ? 0 : 1;
-			mwindow->edl->tracks->select_all(type, selected);
-			if( selected ) *output = 0;
-			break; }
-		default: {
-			int total_selected = mwindow->edl->tracks->total_of(type);
-			int current_output = *output;
-			int selected = !total_selected || (total_selected == 1 &&
-				 current_output ) ? 1 : 0;
-			mwindow->edl->tracks->select_all(type, selected);
-			if( !selected ) *output = 1;
-			break; }
-		}
+		int total_type = mwindow->edl->tracks->total_of(type);
+		int total_selected = sense ? total_type :
+			mwindow->edl->tracks->total() - total_type;
+		int selected = !total_selected || (total_selected == 1 &&
+			 *output == sense ) ? sense : 1-sense;
+		mwindow->edl->tracks->select_all(type, selected);
+		if( selected != sense ) *output = sense;
 
 		patchbay->drag_operation = type;
 		patchbay->new_status = 1;
@@ -567,7 +555,7 @@ int DrawPatch::button_release_event()
 MutePatch::MutePatch(MWindow *mwindow, PatchGUI *patch, int x, int y)
  : BC_Toggle(x, y,
 		mwindow->theme->get_image_set("mutepatch_data"),
-		get_keyframe(mwindow, patch)->value,
+		mwindow->get_int_auto(patch, AUTOMATION_MUTE)->value,
 		"",
 		0,
 		0,
@@ -621,27 +609,6 @@ int MutePatch::button_release_event()
 	return result;
 }
 
-IntAuto* MutePatch::get_keyframe(MWindow *mwindow, PatchGUI *patch)
-{
-	Auto *current = 0;
-	double unit_position = mwindow->edl->local_session->get_selectionstart(1);
-	unit_position = mwindow->edl->align_to_frame(unit_position, 0);
-	unit_position = patch->track->to_units(unit_position, 0);
-	return (IntAuto*)patch->track->automation->autos[AUTOMATION_MUTE]->get_prev_auto(
-		(int64_t)unit_position,
-		PLAY_FORWARD,
-		current);
-}
-
-
-
-
-
-
-
-
-
-
 
 
 ExpandPatch::ExpandPatch(MWindow *mwindow, PatchGUI *patch, int x, int y)