mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2025-02-15 08:31:03 +00:00
Make the track search code Darkplaces-compatible
This commit is contained in:
Eric Wasylishen
parent
125689a499
commit
db58c073e1
4 changed files with 82 additions and 166 deletions
|
|
@ -25,33 +25,53 @@
|
|||
|
||||
#include "quakedef.h"
|
||||
|
||||
void CDAudio_Play(byte track, qboolean looping)
|
||||
void CDAudioBackend_Eject(void)
|
||||
{
|
||||
}
|
||||
|
||||
void CDAudio_Stop(void)
|
||||
void CDAudioBackend_Play(byte track, qboolean looping)
|
||||
{
|
||||
}
|
||||
|
||||
void CDAudio_Pause(void)
|
||||
qboolean CDAudioBackend_IsPlaying()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
void CDAudioBackend_Stop(void)
|
||||
{
|
||||
}
|
||||
|
||||
void CDAudio_Resume(void)
|
||||
void CDAudioBackend_Next(void)
|
||||
{
|
||||
}
|
||||
|
||||
void CDAudio_Update(void)
|
||||
void CDAudioBackend_Prev(void)
|
||||
{
|
||||
}
|
||||
|
||||
int CDAudio_Init(void)
|
||||
void CDAudioBackend_Pause(void)
|
||||
{
|
||||
}
|
||||
|
||||
void CDAudioBackend_Resume(void)
|
||||
{
|
||||
}
|
||||
|
||||
void CDAudioBackend_Info(void)
|
||||
{
|
||||
}
|
||||
|
||||
void CDAudioBackend_Update(void)
|
||||
{
|
||||
}
|
||||
|
||||
int CDAudioBackend_Init(void)
|
||||
{
|
||||
Con_Printf("CDAudio disabled at compile time\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
void CDAudio_Shutdown(void)
|
||||
void CDAudioBackend_Shutdown(void)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -71,49 +71,73 @@ void CDAudio_PlayNamed(const char *name, qboolean looping)
|
|||
|
||||
CDAudio_Stop();
|
||||
|
||||
// copy the track name to playTrackName
|
||||
if (CDAudio_IsNumberedTrack(name))
|
||||
{
|
||||
int track = atoi(name);
|
||||
int track = 0;
|
||||
if (CDAudio_IsNumberedTrack(name))
|
||||
{
|
||||
track = atoi(name);
|
||||
if (track < 100)
|
||||
{
|
||||
track = remap[track];
|
||||
}
|
||||
sprintf(playTrackName, "%02d", track);
|
||||
}
|
||||
q_snprintf(playTrackName, sizeof(playTrackName), "%03d", track);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((strlen(name) + 1) > MAX_QPATH)
|
||||
{
|
||||
return;
|
||||
}
|
||||
sprintf(playTrackName, "%s", name);
|
||||
q_snprintf(playTrackName, sizeof(playTrackName), "%s", name);
|
||||
}
|
||||
|
||||
// First try to play a music file
|
||||
|
||||
char fullTrackName[MAX_QPATH];
|
||||
sprintf(fullTrackName, "music/%s", playTrackName);
|
||||
// First try to play a music file (path code from Darkplaces)
|
||||
|
||||
char filename[MAX_QPATH];
|
||||
|
||||
q_snprintf(fullTrackName, sizeof(fullTrackName), "music/%s", playTrackName);
|
||||
if (CDAudio_TryPlayNamed(fullTrackName, looping)) return;
|
||||
|
||||
q_snprintf(fullTrackName, sizeof(fullTrackName), "music/track%s", playTrackName);
|
||||
if (CDAudio_TryPlayNamed(fullTrackName, looping)) return;
|
||||
|
||||
q_snprintf(fullTrackName, sizeof(fullTrackName), "music/t%s", playTrackName);
|
||||
if (CDAudio_TryPlayNamed(fullTrackName, looping)) return;
|
||||
|
||||
Con_Printf("WARNING: Couldn't open music file %s\n", playTrackName);
|
||||
|
||||
if (CDAudio_IsNumberedTrack(playTrackName))
|
||||
if (track > 0) // We were given a numbered track
|
||||
{
|
||||
CDAudioBackend_Play(atoi(playTrackName), looping);
|
||||
q_snprintf(filename, sizeof(filename), "sound/cdtracks/track%03u", track);
|
||||
if (CDAudio_TryPlayNamed(filename, looping)) return;
|
||||
|
||||
q_snprintf(filename, sizeof(filename), "sound/cdtracks/track%02u", track);
|
||||
if (CDAudio_TryPlayNamed(filename, looping)) return;
|
||||
|
||||
q_snprintf(filename, sizeof(filename), "music/cdtracks/track%03u", track);// added by motorsep
|
||||
if (CDAudio_TryPlayNamed(filename, looping)) return;
|
||||
|
||||
q_snprintf(filename, sizeof(filename), "music/cdtracks/track%02u", track);// added by motorsep
|
||||
if (CDAudio_TryPlayNamed(filename, looping)) return;
|
||||
|
||||
q_snprintf(filename, sizeof(filename), "music/track%03u", track);// added by motorsep
|
||||
if (CDAudio_TryPlayNamed(filename, looping)) return;
|
||||
|
||||
q_snprintf(filename, sizeof(filename), "music/track%02u", track);// added by motorsep
|
||||
if (CDAudio_TryPlayNamed(filename, looping)) return;
|
||||
|
||||
// No music file, so try using the hardware CD player
|
||||
|
||||
CDAudioBackend_Play(track, looping);
|
||||
if (CDAudioBackend_IsPlaying())
|
||||
{
|
||||
usingBackend = true;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// We were given a named track
|
||||
|
||||
q_snprintf(filename, sizeof(filename), "%s", playTrackName);
|
||||
if (CDAudio_TryPlayNamed(filename, looping)) return;
|
||||
|
||||
q_snprintf(filename, sizeof(filename), "sound/%s", playTrackName);
|
||||
if (CDAudio_TryPlayNamed(filename, looping)) return;
|
||||
|
||||
q_snprintf(filename, sizeof(filename), "sound/cdtracks/%s", playTrackName);
|
||||
if (CDAudio_TryPlayNamed(filename, looping)) return;
|
||||
|
||||
q_snprintf(filename, sizeof(filename), "music/%s", playTrackName);
|
||||
if (CDAudio_TryPlayNamed(filename, looping)) return;
|
||||
|
||||
q_snprintf(filename, sizeof(filename), "music/cdtracks/%s", playTrackName);
|
||||
if (CDAudio_TryPlayNamed(filename, looping)) return;
|
||||
|
||||
Con_Printf("WARNING: Couldn't find music track \"%s\"\n", playTrackName);
|
||||
}
|
||||
|
||||
void CDAudio_Play(byte track, qboolean looping)
|
||||
|
|
|
|||
|
|
@ -1,128 +0,0 @@
|
|||
/* Copyright (C) 2007-2008 Jean-Marc Valin
|
||||
* Copyright (C) 2008 Thorvald Natvig
|
||||
*/
|
||||
/**
|
||||
@file resample_sse.h
|
||||
@brief Resampler functions (SSE version)
|
||||
*/
|
||||
/*
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
|
||||
- Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
|
||||
- Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
- Neither the name of the Xiph.org Foundation nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
|
||||
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <xmmintrin.h>
|
||||
|
||||
#define OVERRIDE_INNER_PRODUCT_SINGLE
|
||||
static inline float inner_product_single(const float *a, const float *b, unsigned int len)
|
||||
{
|
||||
int i;
|
||||
float ret;
|
||||
__m128 sum = _mm_setzero_ps();
|
||||
for (i=0;i<len;i+=8)
|
||||
{
|
||||
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_loadu_ps(a+i), _mm_loadu_ps(b+i)));
|
||||
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_loadu_ps(a+i+4), _mm_loadu_ps(b+i+4)));
|
||||
}
|
||||
sum = _mm_add_ps(sum, _mm_movehl_ps(sum, sum));
|
||||
sum = _mm_add_ss(sum, _mm_shuffle_ps(sum, sum, 0x55));
|
||||
_mm_store_ss(&ret, sum);
|
||||
return ret;
|
||||
}
|
||||
|
||||
#define OVERRIDE_INTERPOLATE_PRODUCT_SINGLE
|
||||
static inline float interpolate_product_single(const float *a, const float *b, unsigned int len, const spx_uint32_t oversample, float *frac) {
|
||||
int i;
|
||||
float ret;
|
||||
__m128 sum = _mm_setzero_ps();
|
||||
__m128 f = _mm_loadu_ps(frac);
|
||||
for(i=0;i<len;i+=2)
|
||||
{
|
||||
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_load1_ps(a+i), _mm_loadu_ps(b+i*oversample)));
|
||||
sum = _mm_add_ps(sum, _mm_mul_ps(_mm_load1_ps(a+i+1), _mm_loadu_ps(b+(i+1)*oversample)));
|
||||
}
|
||||
sum = _mm_mul_ps(f, sum);
|
||||
sum = _mm_add_ps(sum, _mm_movehl_ps(sum, sum));
|
||||
sum = _mm_add_ss(sum, _mm_shuffle_ps(sum, sum, 0x55));
|
||||
_mm_store_ss(&ret, sum);
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifdef _USE_SSE2
|
||||
#include <emmintrin.h>
|
||||
#define OVERRIDE_INNER_PRODUCT_DOUBLE
|
||||
|
||||
static inline double inner_product_double(const float *a, const float *b, unsigned int len)
|
||||
{
|
||||
int i;
|
||||
double ret;
|
||||
__m128d sum = _mm_setzero_pd();
|
||||
__m128 t;
|
||||
for (i=0;i<len;i+=8)
|
||||
{
|
||||
t = _mm_mul_ps(_mm_loadu_ps(a+i), _mm_loadu_ps(b+i));
|
||||
sum = _mm_add_pd(sum, _mm_cvtps_pd(t));
|
||||
sum = _mm_add_pd(sum, _mm_cvtps_pd(_mm_movehl_ps(t, t)));
|
||||
|
||||
t = _mm_mul_ps(_mm_loadu_ps(a+i+4), _mm_loadu_ps(b+i+4));
|
||||
sum = _mm_add_pd(sum, _mm_cvtps_pd(t));
|
||||
sum = _mm_add_pd(sum, _mm_cvtps_pd(_mm_movehl_ps(t, t)));
|
||||
}
|
||||
sum = _mm_add_sd(sum, _mm_unpackhi_pd(sum, sum));
|
||||
_mm_store_sd(&ret, sum);
|
||||
return ret;
|
||||
}
|
||||
|
||||
#define OVERRIDE_INTERPOLATE_PRODUCT_DOUBLE
|
||||
static inline double interpolate_product_double(const float *a, const float *b, unsigned int len, const spx_uint32_t oversample, float *frac) {
|
||||
int i;
|
||||
double ret;
|
||||
__m128d sum;
|
||||
__m128d sum1 = _mm_setzero_pd();
|
||||
__m128d sum2 = _mm_setzero_pd();
|
||||
__m128 f = _mm_loadu_ps(frac);
|
||||
__m128d f1 = _mm_cvtps_pd(f);
|
||||
__m128d f2 = _mm_cvtps_pd(_mm_movehl_ps(f,f));
|
||||
__m128 t;
|
||||
for(i=0;i<len;i+=2)
|
||||
{
|
||||
t = _mm_mul_ps(_mm_load1_ps(a+i), _mm_loadu_ps(b+i*oversample));
|
||||
sum1 = _mm_add_pd(sum1, _mm_cvtps_pd(t));
|
||||
sum2 = _mm_add_pd(sum2, _mm_cvtps_pd(_mm_movehl_ps(t, t)));
|
||||
|
||||
t = _mm_mul_ps(_mm_load1_ps(a+i+1), _mm_loadu_ps(b+(i+1)*oversample));
|
||||
sum1 = _mm_add_pd(sum1, _mm_cvtps_pd(t));
|
||||
sum2 = _mm_add_pd(sum2, _mm_cvtps_pd(_mm_movehl_ps(t, t)));
|
||||
}
|
||||
sum1 = _mm_mul_pd(f1, sum1);
|
||||
sum2 = _mm_mul_pd(f2, sum2);
|
||||
sum = _mm_add_pd(sum1, sum2);
|
||||
sum = _mm_add_sd(sum, _mm_unpackhi_pd(sum, sum));
|
||||
_mm_store_sd(&ret, sum);
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -149,7 +149,7 @@ void *S_CodecLoad(const char *filename, snd_info_t *info)
|
|||
codec = S_FindCodecForFile(filename);
|
||||
if(!codec)
|
||||
{
|
||||
Con_Printf("Unknown extension for %s\n", filename);
|
||||
Con_DPrintf("Unknown extension for %s\n", filename);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -172,7 +172,7 @@ snd_stream_t *S_CodecOpenStream(const char *filename)
|
|||
codec = S_FindCodecForFile(filename);
|
||||
if(!codec)
|
||||
{
|
||||
Con_Printf("Unknown extension for %s\n", filename);
|
||||
Con_DPrintf("Unknown extension for %s\n", filename);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue