X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=453aba622b1b565afc8b83ac7efd2f99ee3c1745;hb=1c2282115c0679dfc38bfe84bcafead7e6499c9a;hp=06589a094cecb57ea2478a29a8acf6c2fb90ebd4;hpb=4a408b467f84dd7e25f9ab78b789d3605bd2a86e;p=xonotic%2Fdarkplaces.git

diff --git a/cd_shared.c b/cd_shared.c
index 06589a09..453aba62 100644
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -301,8 +301,12 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryr
 	{
 		                              dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%03u.wav", track);
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%03u.ogg", track);
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/track%03u.ogg", track);// added by motorsep
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/cdtracks/track%03u.ogg", track);// added by motorsep
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%02u.wav", track);
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%02u.ogg", track);
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/track%02u.ogg", track);// added by motorsep
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/cdtracks/track%02u.ogg", track);// added by motorsep
 	}
 	else
 	{
@@ -315,16 +319,14 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping, qboolean tryr
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/%s", trackname);
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/%s.wav", trackname);
 		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/%s.ogg", trackname);
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/%s.ogg", trackname); // added by motorsep
+		if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "music/cdtracks/%s.ogg", trackname); // added by motorsep
 	}
-	if (FS_FileExists(filename) && (sfx = S_PrecacheSound (filename, false, true)))
+	if (FS_FileExists(filename) && (sfx = S_PrecacheSound (filename, false, false)))
 	{
-		faketrack = S_StartSound_StartPosition (-1, 0, sfx, vec3_origin, cdvolume, 0, startposition);
+		faketrack = S_StartSound_StartPosition_Flags (-1, 0, sfx, vec3_origin, cdvolume, 0, startposition, (looping ? CHANNELFLAG_FORCELOOP : 0) | CHANNELFLAG_FULLVOLUME | CHANNELFLAG_LOCALSOUND);
 		if (faketrack != -1)
 		{
-			if (looping)
-				S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
-			S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
-			S_SetChannelFlag (faketrack, CHANNELFLAG_LOCALSOUND, true); // not pausable
 			if(track >= 1)
 			{
 				if(cdaudio.integer != 0) // we don't need these messages if only fake tracks can be played anyway
@@ -387,7 +389,7 @@ void CDAudio_Stop (void)
 
 	if (faketrack != -1)
 	{
-		S_StopChannel (faketrack, true);
+		S_StopChannel (faketrack, true, true);
 		faketrack = -1;
 	}
 	else if (cdPlaying && (CDAudio_SysStop() == -1))
@@ -502,7 +504,7 @@ static void CD_f (void)
 	{
 		if (music_playlist_index.integer >= 0)
 			return;
-		CDAudio_Play_byName(Cmd_Argv (2), false, true, 0);
+		CDAudio_Play_byName(Cmd_Argv (2), false, true, (Cmd_Argc() > 3) ? atof( Cmd_Argv(3) ) : 0);
 		return;
 	}
 
@@ -510,7 +512,7 @@ static void CD_f (void)
 	{
 		if (music_playlist_index.integer >= 0)
 			return;
-		CDAudio_Play_byName(Cmd_Argv (2), true, true, 0);
+		CDAudio_Play_byName(Cmd_Argv (2), true, true, (Cmd_Argc() > 3) ? atof( Cmd_Argv(3) ) : 0);
 		return;
 	}
 
@@ -573,8 +575,8 @@ static void CD_f (void)
 	Con_Printf("cd remap <remap1> [remap2] [remap3] [...] - chooses (possibly emulated) CD tracks to play when a map asks for a particular track, this has many uses\n");
 	Con_Printf("cd close - closes CD tray\n");
 	Con_Printf("cd eject - stops playing music and opens CD tray to allow you to change disc\n");
-	Con_Printf("cd play <tracknumber> - plays selected track in remapping table\n");
-	Con_Printf("cd loop <tracknumber> - plays and repeats selected track in remapping table\n");
+	Con_Printf("cd play <tracknumber> <startposition> - plays selected track in remapping table\n");
+	Con_Printf("cd loop <tracknumber> <startposition> - plays and repeats selected track in remapping table\n");
 	Con_Printf("cd stop - stops playing current CD track\n");
 	Con_Printf("cd pause - pauses CD playback\n");
 	Con_Printf("cd resume - unpauses CD playback\n");
@@ -599,7 +601,7 @@ void CDAudio_SetVolume (float newvol)
 		if (faketrack != -1)
 			S_SetChannelVolume (faketrack, newvol);
 		else
-			CDAudio_SysSetVolume (newvol);
+			CDAudio_SysSetVolume (newvol * mastervolume.value);
 	}
 
 	cdvolume = newvol;
@@ -706,7 +708,7 @@ void CDAudio_Update (void)
 		lastplaylist = music_playlist_index.integer;
 	}
 	else if (lastplaylist != music_playlist_index.integer
-	|| (bgmvolume.value > 0 && !music_playlist_playing))
+	|| (bgmvolume.value > 0 && !music_playlist_playing && music_playlist_index.integer >= 0))
 	{
 		// active playlist changed, save position and switch track
 		CDAudio_StartPlaylist(true);