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

diff --git a/cinelerra-5.1/cinelerra/patchgui.C b/cinelerra-5.1/cinelerra/patchgui.C
index 72211d1a..a2a19864 100644
--- a/cinelerra-5.1/cinelerra/patchgui.C
+++ b/cinelerra-5.1/cinelerra/patchgui.C
@@ -42,7 +42,7 @@
 #include "tracks.h"
 #include "transportque.h"
 #include "vframe.h"
-
+#include "zwindow.h"
 
 
 PatchGUI::PatchGUI(MWindow *mwindow,
@@ -65,22 +65,24 @@ PatchGUI::PatchGUI(MWindow *mwindow,
 	mute = 0;
 	expand = 0;
 	nudge = 0;
+	mix = 0;
 	change_source = 0;
-	track_id = -1;
-	if(track) track_id = track->get_id();
+	track_id = track ? track->get_id() : -1;
+	mixer = 0;
 }
 
 PatchGUI::~PatchGUI()
 {
-	if(title) delete title;
-	if(record) delete record;
-	if(play) delete play;
-//	if(automate) delete automate;
-	if(gang) delete gang;
-	if(draw) delete draw;
-	if(mute) delete mute;
-	if(expand) delete expand;
-	if(nudge) delete nudge;
+	delete title;
+	delete record;
+	delete play;
+//	delete automate;
+	delete gang;
+	delete draw;
+	delete mute;
+	delete expand;
+	delete nudge;
+	delete mix;
 }
 
 void PatchGUI::create_objects()
@@ -713,13 +715,13 @@ int NudgePatch::handle_event()
 
 void NudgePatch::set_value(int64_t value)
 {
-	mwindow->undo->update_undo_before(_("nudge"), this);
+	mwindow->undo->update_undo_before(_("nudge."), this);
 	patch->track->nudge = value;
 
 	if(patch->track->gang && patch->track->record)
 		patch->patchbay->synchronize_nudge(patch->track->nudge, patch->track);
 
-	mwindow->undo->update_undo_after(_("nudge"), LOAD_PATCHES);
+	mwindow->undo->update_undo_after(_("nudge."), LOAD_PATCHES);
 
 	mwindow->gui->unlock_window();
 	if(patch->track->data_type == TRACK_VIDEO)
@@ -789,5 +791,34 @@ void NudgePatch::update()
 }
 
 
+MixPatch::MixPatch(MWindow *mwindow, PatchGUI *patch, int x, int y)
+ : BC_Toggle(x, y, mwindow->theme->get_image_set("mixpatch_data"),
+	patch->mixer, "", 0, 0, 0)
+{
+	this->mwindow = mwindow;
+	this->patch = patch;
+}
+
+MixPatch::~MixPatch()
+{
+}
+
+int MixPatch::handle_event()
+{
+	int v = patch->track ? get_value() : 0;
+	if( patch->mixer != v ) {
+		if( patch->track )
+			mwindow->gui->update_mixers(patch->track, v);
+		else
+			update(v);
+		mwindow->update_mixer_tracks();
+	}
+	return 1;
+}
 
+void MixPatch::update(int v)
+{
+	patch->mixer = v;
+	BC_Toggle::update(v);
+}