X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftracks.C;h=7feb1f99cfc1febeec05653ee8843c244ec52f1f;hp=0f53df742895db789f82963b445cd5331dbeceb1;hb=7718f72da6995e7b2b2a59dcc61cc80a2f4bf38f;hpb=e23393f4ff9f772ac8f47926cf490dc87a630ed4

diff --git a/cinelerra-5.1/cinelerra/tracks.C b/cinelerra-5.1/cinelerra/tracks.C
index 0f53df74..7feb1f99 100644
--- a/cinelerra-5.1/cinelerra/tracks.C
+++ b/cinelerra-5.1/cinelerra/tracks.C
@@ -113,14 +113,16 @@ void Tracks::clear_selected_edits()
 	}
 }
 
-void Tracks::select_affected_edits(double position, Track *start_track)
+void Tracks::select_affected_edits(double position, Track *start_track, int sense)
 {
 	for( Track *track=start_track; track; track=track->next ) {
 		if( !track->record ) continue;
 		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+			if( edit->silence() ) continue;
 			double startproject = track->from_units(edit->startproject);
 			if( edl->equivalent(startproject, position) ) {
-				edit->is_selected = 1;
+				edit->is_selected = sense >= 0 ? sense :
+					edit->is_selected ? 0 : 1;
 				break;
 			}
 		}
@@ -168,6 +170,8 @@ void Tracks::copy_from(Tracks *tracks)
 	Track *new_track = 0;
 
 	delete_all_tracks();
+	int solo_track_id = tracks->edl->local_session->solo_track_id;
+
 	for(Track *current = tracks->first; current; current = NEXT)
 	{
 		switch(current->data_type)
@@ -185,6 +189,9 @@ void Tracks::copy_from(Tracks *tracks)
 			continue;
 		}
 		new_track->copy_from(current);
+
+		if( current->get_id() == solo_track_id )
+			edl->local_session->solo_track_id = new_track->get_id();
 	}
 }
 
@@ -623,6 +630,12 @@ Track* Tracks::number(int number)
 	return current;
 }
 
+Track* Tracks::get_track_by_id(int id)
+{
+	Track *track = edl->tracks->first;
+	while( track && track->get_id() != id ) track = track->next;
+	return track;
+}
 
 int Tracks::total_playable_vtracks()
 {
@@ -658,6 +671,7 @@ int Tracks::new_group(int id)
 	for( Track *track=first; track; track=track->next ) {
 		if( !track->record ) continue;
 		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+			if( edit->group_id > 0 ) continue;
 			if( !edit->is_selected ) continue;
 			edit->group_id = id;
 			++count;
@@ -672,7 +686,7 @@ int Tracks::set_group_selected(int id, int v)
 	for( Track *track=first; track; track=track->next ) {
 		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
 			if( edit->group_id != id ) continue;
-			edit->is_selected = v;
+			edit->is_selected = v >= 0 ? v : !edit->is_selected ? 1 : 0;
 			++count;
 		}
 	}