diff src/RecordedMultitrackAudio.cpp @ 50:93d21c20cfbc

Added Markers and the ability to switch to these points in the file when playing

--- a/src/RecordedMultitrackAudio.cpp	Tue May 22 22:53:44 2012 +0100
+++ b/src/RecordedMultitrackAudio.cpp	Thu Jun 14 20:04:49 2012 +0100
@@ -16,7 +16,7 @@
 
 	printf("loaded max val  is %f\n", loadedAudioFiles[0].fileLoader.onsetDetect.onsetDetector.maximumDetectionValue);
 	
-	int multitrackToLoad = 23;
+	int multitrackToLoad = 27;
 	setDifferentMultitracks(multitrackToLoad);//command to load this set of audio files - see below
 	
 	//number 7 is problematic with memory
@@ -29,7 +29,7 @@
 
 	
 }
-
+#pragma mark -loadingPrerecordedTracks
 void RecordedMultitrackAudio::setDifferentMultitracks(const int& setToLoad){
 	const char	*kickfilename ;//= "../../../data/sound/LiveDues/kick_liveDues.wav";	
 	const char	*bassfilename ;//"../../../data/sound/LiveDues/bass_upsideLive.wav";	
@@ -66,7 +66,9 @@
 			snarefilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsIdiotDance/tractorsSetToRecord2/Bounces/TakeTwo/03snare_bip.wav";	
 			guitarfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsIdiotDance/tractorsSetToRecord2/Bounces/TakeTwo/04guitar di_bip.wav";	
 			break;
-		case 5:
+			
+			//LEWES multitracks?
+	/*	case 5:
 			kickfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take12/02kick_bip.wav";
 			bassfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take12/01bass_bip.wav";
 			snarefilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take12/03snare_bip.wav";	
@@ -97,7 +99,7 @@
 			bassfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/DownLine5/01bass.wav";
 			snarefilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/DownLine5/03snare.wav";	
 			break;	
-			
+	*/		
 		case 10:
 			kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take2/02Kick_bip.wav";
 			bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take2/01Bass.wav";
@@ -127,12 +129,20 @@
 			break;		
 			
 			
-		case 14:
+		/*case 14:
 			kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneShorter/02Kick_bip.wav";
 			bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneShorter/01Bass.wav";
 			snarefilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneShorter/03Snare_bip.wav";	
 			guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneShorter/04Elec_SM57_bip.wav";	
-			break;			
+			break;	
+		*/	
+		case 14:
+			kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoFull/02Kick_bip.wav";
+			bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoFull/01Bass.wav";
+			snarefilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoFull/03Snare_bip.wav";	
+			guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoFull/Ac D.I.wav";	
+			break;		
+			
 	
 		case 15:
 			kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoShorter/02Kick_bip.wav";
@@ -199,13 +209,39 @@
 			guitarfilename = "/Volumes/Supersaurus/TractorsAlbum/TractorsMotorcade/Motorcade/Bounces/MotorcadeMulittracks/Motorcade_Take_57/guitar DI_bip.wav";
 			break;
 			
+		case 24:
+			bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/Festival_Multitracks/TakeThree_23/bass D.I.wav";
+			kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/Festival_Multitracks/TakeThree_23/Kick_bip.wav";
+			snarefilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/Festival_Multitracks/TakeThree_23/Snare_bip.wav";
+			guitarfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/Festival_Multitracks/TakeThree_23/Elec SM57_bip.wav";
+			break;	
+		case 25:
+			bassfilename = "/Volumes/G-FORCE X/WorkBackup/Truck/Stones 1.0/Bounces/Stones_Multitracks/TakeThree_21/Bass DI_bip.wav";
+			kickfilename = "/Volumes/G-FORCE X/WorkBackup/Truck/Stones 1.0/Bounces/Stones_Multitracks/TakeThree_21/BD_bip.wav";
+			snarefilename = "/Volumes/G-FORCE X/WorkBackup/Truck/Stones 1.0/Bounces/Stones_Multitracks/TakeThree_21/Snr T_bip.wav";
+			guitarfilename = "/Volumes/G-FORCE X/WorkBackup/Truck/Stones 1.0/Bounces/Stones_Multitracks/TakeThree_21/Guit 57_bip.wav";
+			break;	
+			
+		case 26:
+			bassfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/PennyArcade_Multitracks/TakeTwo_5/bass di_bip.wav";
+			kickfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/PennyArcade_Multitracks/TakeTwo_5/kick_bip.wav";
+			snarefilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/PennyArcade_Multitracks/TakeTwo_5/snare_bip.wav";
+			guitarfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/PennyArcade_Multitracks/TakeTwo_5/guitar_bip.wav";
+			break;	
+			
+		case 27:
+			bassfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/LewesStudioFinal/bass_DI_bip.wav";
+			kickfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/LewesStudioFinal/kick_bip.wav";
+			snarefilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/LewesStudioFinal/snare_bip.wav";
+			guitarfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/LewesStudioFinal/guitar sm57_bip.wav";
+			break;		
 			
 			
 	}
 	if (kickfilename != NULL)
 	loadAudioTrack(kickfilename, 0);
 	
-	if (bassfilename != NULL){
+	if (bassfilename != NULL){	
 		printf("BASSfilename: %s\n", bassfilename);
 		loadAudioTrack(bassfilename, 1);
 	}
@@ -244,7 +280,7 @@
 	}
 }
 
-
+#pragma mark -update 
 void RecordedMultitrackAudio::updatePosition(){
 	for (int i = 0;i < numberOfAudioTracks;i++)
 		loadedAudioFiles[i].updateToPlayPosition();
@@ -255,6 +291,11 @@
 		loadedAudioFiles[i].updateToMillisPosition(millis);
 }
 
+void RecordedMultitrackAudio::updatePlaybackPositionToMillis(const double& millis){
+	for (int i = 0;i < numberOfAudioTracks;i++)
+		loadedAudioFiles[i].updatePlaybackPositionToMillis(millis);
+}
+
 void RecordedMultitrackAudio::switchScreens(){
 	for (int i = 0;i < numberOfAudioTracks;i++)
 		loadedAudioFiles[i].switchScreens();
@@ -283,11 +324,13 @@
 }
 
 void RecordedMultitrackAudio::zoomIn(){
+	printf("zoom in\n");
 	for (int i = 0;i < numberOfAudioTracks;i++)
 		loadedAudioFiles[i].fileLoader.zoomIn();
 }
 
 void RecordedMultitrackAudio::zoomOut(){
+		printf("zoom out\n");
 	for (int i = 0;i < numberOfAudioTracks;i++)
 		loadedAudioFiles[i].fileLoader.zoomOut();
 }