Automatic mixer strip management LMMS#1215 - fix some issues with tra…

…ck naming and track delete
spechtstatt · May 24, 2022 · ec1c8a2 · ec1c8a2
1 parent 8c6076d
commit ec1c8a2
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 31 deletions.
diff --git a/include/MixerView.h b/include/MixerView.h
@@ -105,8 +105,8 @@ class LMMS_EXPORT MixerView : public QWidget, public ModelView,
 	// useful for loading projects
 	void refreshDisplay();
 
-	// Auto track link support
-	void updateAfterTrackAdd(Track * track);
+	// Auto track link support	
+	void updateAfterTrackAdd(Track * track, QString name = "");
 	void updateAfterTrackStyleModify(Track * track);
 	void updateAfterTrackMixerLineModify(Track * track);
 	void updateAfterTrackMove(Track * track);

diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp
@@ -301,7 +301,7 @@ void Mixer::deleteChannel( int index )
 		else if ( curIndex > index )
 		{
 			// subtract 1 to make up for the missing channel
-			model->setValue(-1);
+			model->setValue(curIndex-1);
 		}
 	});
 

diff --git a/src/gui/MixerView.cpp b/src/gui/MixerView.cpp
@@ -170,7 +170,7 @@ MixerView::~MixerView()
 	}
 }
 
-void MixerView::updateAfterTrackAdd(Track * track)
+void MixerView::updateAfterTrackAdd(Track * track, QString name)
 {
 	// TODO: check if an autotrack mode is enabled (still missing)
 	Mixer * mix = Engine::mixer();
@@ -181,6 +181,7 @@ void MixerView::updateAfterTrackAdd(Track * track)
 		model->setValue( channelIndex );
 		mix->mixerChannel(channelIndex)->m_autoTrackLinkModel.setValue(true);
 
+		if (name != "") track->setName(name);
 		updateAfterTrackStyleModify(track);
 
 		setCurrentMixerLine( channelIndex );
@@ -193,13 +194,16 @@ void MixerView::updateAfterTrackStyleModify(Track * track)
 	IntModel * model = mix->getChannelModelByTrack(track);
 	if (model != NULL)
 	{
-		int index = model->value();
-		MixerChannel * channel = mix->mixerChannel(index);
-		if (channel->m_autoTrackLinkModel.value())
+		int channelIndex = model->value();
+		if (channelIndex>0)
 		{
-			channel->m_name = track->name();
-			if (track->useColor()) { channel->setColor (track->color()); }
-			setCurrentMixerLine(index);
+			MixerChannel * channel = mix->mixerChannel(channelIndex);
+			if (channel->m_autoTrackLinkModel.value())
+			{
+				channel->m_name = track->name();
+				if (track->useColor()) { channel->setColor (track->color()); }
+				setCurrentMixerLine(channelIndex);
+			}
 		}
 	}
 }
@@ -233,10 +237,14 @@ void MixerView::updateAfterTrackMove(Track * track)
 	IntModel * model = Engine::mixer()->getChannelModelByTrack(track);
 	if (model != NULL)
 	{
-		MixerChannel * channel = mix->mixerChannel(model->value());
-		if (channel->m_autoTrackLinkModel.value())
+		int channelIndex = model->value();
+		if (channelIndex>0)
 		{
-			updateAutoTrackSortOrder();
+			MixerChannel * channel = mix->mixerChannel(channelIndex);
+			if (channel->m_autoTrackLinkModel.value())
+			{
+				updateAutoTrackSortOrder();
+			}
 		}
 	}
 }
@@ -247,12 +255,15 @@ void MixerView::updateAfterTrackDelete(Track * track)
 	IntModel * model = mix->getChannelModelByTrack(track);
 	if ( model != NULL)
 	{
-		int channelIndex = mix->getChannelModelByTrack(track)->value();
-		MixerChannel * channel = mix->mixerChannel(channelIndex);
-		if (channel->m_autoTrackLinkModel.value())
+		int channelIndex = model->value();
+		if (channelIndex>0)
 		{
-			deleteChannel(channelIndex);
-			updateAutoTrackSortOrder();
+			MixerChannel * channel = mix->mixerChannel(channelIndex);
+			if (channel->m_autoTrackLinkModel.value())
+			{
+				deleteChannel(channelIndex);
+				updateAutoTrackSortOrder();
+			}
 		}
 	}
 }
@@ -280,7 +291,6 @@ int MixerView::addNewChannel()
 
 void MixerView::updateAutoTrackSortOrder()
 {
-
 	Mixer * mix = Engine::mixer();
 	QList<int> *list = new QList<int>();
 
@@ -501,7 +511,20 @@ void MixerView::updateMixerLine(int index)
 
 void MixerView::deleteChannel(int index)
 {
+	if( index == 0 ) return;
+
+	// remember selected line
+	int selLine = m_currentMixerLine->channelIndex();
+
 	deleteChannelInternal(index);
+
+	// select the next channel
+	if( selLine >= m_mixerChannelViews.size() )
+	{
+		selLine = m_mixerChannelViews.size()-1;
+	}
+	setCurrentMixerLine(selLine);
+
 	updateMaxChannelSelector();
 }
 
@@ -511,9 +534,6 @@ void MixerView::deleteChannelInternal(int index)
 	// can't delete master
 	if( index == 0 ) return;
 
-	// remember selected line
-	int selLine = m_currentMixerLine->channelIndex();
-
 	// in case the deleted channel is soloed or the remaining
 	// channels will be left in a muted state
 	Engine::mixer()->clearChannel(index);
@@ -541,12 +561,6 @@ void MixerView::deleteChannelInternal(int index)
 	}
 	m_mixerChannelViews.remove(index);
 
-	// select the next channel
-	if( selLine >= m_mixerChannelViews.size() )
-	{
-		selLine = m_mixerChannelViews.size()-1;
-	}
-	setCurrentMixerLine(selLine);
 }
 
 

diff --git a/src/gui/TrackContainerView.cpp b/src/gui/TrackContainerView.cpp
@@ -378,9 +378,9 @@ void TrackContainerView::dropEvent( QDropEvent * _de )
 		InstrumentTrack * it = dynamic_cast<InstrumentTrack *>(
 				Track::create( Track::InstrumentTrack,
 								m_tc ) );
-		getGUI()->mixerView()->updateAfterTrackAdd(it);
 		InstrumentLoaderThread *ilt = new InstrumentLoaderThread(
 					this, it, value );
+		getGUI()->mixerView()->updateAfterTrackAdd(it, value);
 		ilt->start();
 		//it->toggledInstrumentTrackButton( true );
 		_de->accept();
@@ -392,10 +392,10 @@ void TrackContainerView::dropEvent( QDropEvent * _de )
 		InstrumentTrack * it = dynamic_cast<InstrumentTrack *>(
 				Track::create( Track::InstrumentTrack,
 								m_tc ) );
-		getGUI()->mixerView()->updateAfterTrackAdd(it);
 		PluginFactory::PluginInfoAndKey piakn =
 			getPluginFactory()->pluginSupportingExtension(FileItem::extension(value));
 		Instrument * i = it->loadInstrument(piakn.info.name(), &piakn.key);
+		getGUI()->mixerView()->updateAfterTrackAdd(it);
 		i->loadFile( value );
 		//it->toggledInstrumentTrackButton( true );
 		_de->accept();
@@ -406,9 +406,9 @@ void TrackContainerView::dropEvent( QDropEvent * _de )
 		InstrumentTrack * it = dynamic_cast<InstrumentTrack *>(
 				Track::create( Track::InstrumentTrack,
 								m_tc ) );
-		getGUI()->mixerView()->updateAfterTrackAdd(it);
 		it->setSimpleSerializing();
 		it->loadSettings( dataFile.content().toElement() );
+		getGUI()->mixerView()->updateAfterTrackAdd(it);
 		//it->toggledInstrumentTrackButton( true );
 		_de->accept();
 	}