Fixed mistake. Removed message box indicating successful file load.

adct-the-experimenter · Jan 1, 2021 · ef542d6 · ef542d6
1 parent 9dca18a
commit ef542d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/osgViewerWX.cpp b/src/osgViewerWX.cpp
@@ -531,7 +531,7 @@ MainFrame::MainFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
 											0, wxEmptyString);
 
 	//if using MS Windows OS
-	#ifdef _WIN32
+	#ifdef WIN32
     toolbar->AddTool(toolbar->AddControl( sp_toolbar_text ) );
 
     toolbar->AddTool( toolbar->AddControl(m_sp_toolbar_combobox, wxEmptyString) );
@@ -540,7 +540,7 @@ MainFrame::MainFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
     #endif
 
     //if not using MS Windows OS
-    #ifndef _WIN32
+    #ifndef WIN32
     toolbar->AddControl( sp_toolbar_text );
     toolbar->AddControl(m_sp_toolbar_combobox);
     #endif
@@ -830,11 +830,6 @@ void MainFrame::LoadProject()
 
 				m_soundproducer_track_vec.at(i)->LoadSoundProducerTrackSaveData(ptrSPTracksSaveDataVec.at(i));
 
-				if(ptrSPTracksSaveDataVec.at(i).soundfilepath != "")
-				{
-					m_soundproducer_track_vec.at(i)->GetReferenceToStereoAudioTrack()->LoadAudioFromFileToTrack(ptrSPTracksSaveDataVec.at(i).soundfilepath);
-				}
-
 
 				if(ptrSPTracksSaveDataVec.at(i).soundproducer_name != "")
 				{

diff --git a/src/timeline-track-editor/src/audio-track.cpp b/src/timeline-track-editor/src/audio-track.cpp
@@ -107,10 +107,10 @@ void AudioTrack::ReadAndCopyDataFromInputFile(std::vector<double> *audio_data_in
 	/* Close input and stream files. */
 	sf_close(inputFile);
 
-	std::string messageString;
-	messageString.append("Successfully loaded and saved a copy of audio data of");
-	messageString.append(inputSoundFilePath);
-	wxMessageBox( messageString );
+	//std::string messageString;
+	//messageString.append("Successfully loaded and saved a copy of audio data of");
+	//messageString.append(inputSoundFilePath);
+	//wxMessageBox( messageString );
 }
 
 void AudioTrack::CopyInputDataIntoAudioDataStream(std::vector<double> *audio_data_input_copy_ptr, AudioStreamContainer* audio_data_stream_ptr,std::string streamSoundFilePath,SF_INFO& input_sfinfo)