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
if (faketrack != -1)
{
- S_StopChannel (faketrack, true);
+ S_StopChannel (faketrack, true, true);
faketrack = -1;
}
else if (cdPlaying && (CDAudio_SysStop() == -1))
{
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;
}
{
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;
}
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");
if (faketrack != -1)
S_SetChannelVolume (faketrack, newvol);
else
- CDAudio_SysSetVolume (newvol);
+ CDAudio_SysSetVolume (newvol * mastervolume.value);
}
cdvolume = newvol;