Merge pull request #25 from adct-the-experimenter/sync_multiple_sources

Fixed issue of sound producer track selection of sound producer reset…

include/soundproducer-registry.h

@@ -41,12 +41,17 @@ class SoundProducerRegistry
 	//function to add reference to combo box to combo_box_ptr_vec
 	void AddReferenceToComboBox(wxComboBox* thisComboBox);
 
+	//function to remove a combo box pointer from container, use when soundproducer track is removed
+	void RemoveLastComboBoxReference();
+
 	//function to update all comboboxes list, used for updating list after removal of a selection that is being edited by a soundproducer track
 	void UpdateAllComboBoxesList();
 
 	//function to remove a string name from all combo boxes except for one
 	void RemoveThisNameFromAllComboBoxesExceptThisOne(std::string thisName, wxComboBox* thisCombobox);
 
+
+
 private:
 
 	//list of names for combo box

src/openalsoftaudioengine.cpp

@@ -52,6 +52,7 @@ bool OpenAlSoftAudioEngine::initOpenALSoft()
 	{
 		std::cout << "OpenAL Soft was unable to initialize! \n";
 		std::cout << "Unable to initialize default audio device! \n";
+		std::cout << alGetString(alGetError()) << std::endl;
 		return false;
 	}
 
@@ -61,6 +62,7 @@ bool OpenAlSoftAudioEngine::initOpenALSoft()
 	{
 		std::cout << "OpenAL Soft was unable to initialize! \n";
 		std::cout << "Unable to initialize OpenAL context! \n";
+		std::cout << alGetString(alGetError()) << std::endl;
 		return false;
 	}
 	else{alcMakeContextCurrent(alContext);}

src/osgViewerWX.cpp

@@ -605,10 +605,11 @@ void MainFrame::CreateSoundProducer(std::string& name, std::string& filePath, AL
 	soundproducer_registry.AddRecentSoundProducerMadeToRegistry();
 
 	//update lists of all sound producer tracks
-	for(size_t i=0; i < m_soundproducer_track_vec.size(); i++)
-	{
-		m_soundproducer_track_vec[i]->UpdateComboBoxListFromSoundProducerRegistry();
-	}
+	//for(size_t i=0; i < m_soundproducer_track_vec.size(); i++)
+	//{
+	//	m_soundproducer_track_vec[i]->UpdateComboBoxListFromSoundProducerRegistry();
+	//}
+	soundproducer_registry.UpdateAllComboBoxesList();
 }
 
 void MainFrame::OnEditMultipleSoundProducers(wxCommandEvent& event)
@@ -835,6 +836,7 @@ void MainFrame::OnRemoveSoundProducerTrack(wxCommandEvent& event)
 		//destroy last soundproducertrack from vector containing soundproducertracks
 		m_soundproducer_track_vec.pop_back();
 		soundproducertrack_manager_ptr->RemoveSourceOfLastTrackFromSoundProducerTrackManager();
+		soundproducer_registry.RemoveLastComboBoxReference();
 
 		std::cout << "\nItem Count: " << timeFrame->GetTimelineWindow()->GetSizer()->GetItemCount() << std::endl;
 	}

src/soundproducer-registry.cpp

@@ -109,6 +109,11 @@ void SoundProducerRegistry::AddReferenceToComboBox(wxComboBox* thisComboBox)
 	combo_box_ptr_vec.push_back(thisComboBox);
 }
 
+void SoundProducerRegistry::RemoveLastComboBoxReference()
+{
+	combo_box_ptr_vec.pop_back();
+}
+
 void SoundProducerRegistry::UpdateAllComboBoxesList()
 {
 	for(size_t i=0; i < combo_box_ptr_vec.size(); i++)
@@ -117,8 +122,9 @@ void SoundProducerRegistry::UpdateAllComboBoxesList()
 
 		combo_box_ptr_vec[i]->Clear();
 		combo_box_ptr_vec[i]->Append(soundproducers_to_edit_wxstring);
-		combo_box_ptr_vec[i]->Append(currentNameSelected);
-		combo_box_ptr_vec[i]->SetValue(currentNameSelected);
+
+		int select_index = combo_box_ptr_vec[i]->FindString(currentNameSelected,true); //case sensitive = true
+		combo_box_ptr_vec[i]->SetSelection(select_index);
 	}
 }
 
@@ -137,6 +143,10 @@ void SoundProducerRegistry::RemoveThisNameFromAllComboBoxesExceptThisOne(std::st
 			combo_box_ptr_vec[i]->Clear();
 			combo_box_ptr_vec[i]->Append(soundproducers_to_edit_wxstring);
 
+			int select_index = combo_box_ptr_vec[i]->FindString(currentSelectionString,true); //case sensitive = true
+			combo_box_ptr_vec[i]->SetSelection(select_index); 	
 		}
 	}
 }
+
+

src/soundproducer-track.cpp

@@ -173,6 +173,11 @@ void SoundProducerTrack::SelectSoundProducerByName(std::string name)
 	{
 		thisSoundProducer->SetReferenceToTrackSource(&track_source);
 		SoundProducerTrack::SetReferenceToSoundProducerToManipulate(thisSoundProducer);
+
+		if(soundproducer_registry_ptr == nullptr)
+		{
+			soundproducer_registry_ptr->RemoveThisNameFromAllComboBoxesExceptThisOne(name,m_combo_box);
+		}
 	}	
 
 }