eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4947 fc73d0e0-1445-4013-8a0c-d673dee63da5

Browse source
This commit is contained in:
Spoike 2015-07-26 11:04:00 +00:00
parent 6d36834f8e
commit 63713793c9
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
engine/client/m_mp3.c
View file

@ -2,6 +2,7 @@
//was origonally an mp3 track selector, now handles lots of media specific stuff - like q3 films! //was origonally an mp3 track selector, now handles lots of media specific stuff - like q3 films!
//should rename to m_media.c //should rename to m_media.c
#include "quakedef.h" #include "quakedef.h"
#ifdef GLQUAKE #ifdef GLQUAKE
#include "glquake.h"//fixme #include "glquake.h"//fixme
#endif #endif
@ -25,6 +26,10 @@ typedef struct mediatrack_s{
qboolean media_fadeout; qboolean media_fadeout;
float media_fadeouttime; float media_fadeouttime;
//info about the current stuff that is playing.
static char media_currenttrack[MAX_QPATH];
static char media_friendlyname[MAX_QPATH];
#endif #endif
//higher bits have priority (if they have something to play). //higher bits have priority (if they have something to play).
@ -32,11 +37,8 @@ float media_fadeouttime;
#define MEDIA_CVARLIST (1u<<1) //cvar abuse. handy for preserving times when switching tracks. #define MEDIA_CVARLIST (1u<<1) //cvar abuse. handy for preserving times when switching tracks.
#define MEDIA_PLAYLIST (1u<<2) // #define MEDIA_PLAYLIST (1u<<2) //
static unsigned int media_playlisttypes; static unsigned int media_playlisttypes;
//info about the current stuff that is playing.
static unsigned int media_playlistcurrent; static unsigned int media_playlistcurrent;
static char media_currenttrack[MAX_QPATH];
static char media_friendlyname[MAX_QPATH];
static int cdplayingtrack; //currently playing cd track (becomes 0 when paused) static int cdplayingtrack; //currently playing cd track (becomes 0 when paused)
static int cdpausedtrack; //currently paused cd track static int cdpausedtrack; //currently paused cd track
@ -78,7 +80,7 @@ static cvar_t music_playlist_sampleposition[] =
#define CVAR_ABUSE_LIMIT countof(music_playlist_list) #define CVAR_ABUSE_LIMIT countof(music_playlist_list)
qboolean Media_Changed (unsigned int mediatype) static qboolean Media_Changed (unsigned int mediatype)
{ {
//something changed, but it has a lower priority so we don't care //something changed, but it has a lower priority so we don't care
if (mediatype < media_playlistcurrent) if (mediatype < media_playlistcurrent)
@ -4384,9 +4386,9 @@ void Media_RecordAudioFrame (short *sample_buffer, int samples) {}
void Media_StopRecordFilm_f (void) {} void Media_StopRecordFilm_f (void) {}
void Media_RecordFilm_f (void){} void Media_RecordFilm_f (void){}
void M_Menu_Media_f (void) {} void M_Menu_Media_f (void) {}
float Media_CrossFade(int ch, float vol) {return vol;} float Media_CrossFade(int ch, float vol, float time) {return vol;}
char *Media_NextTrack(int musicchannelnum) {return NULL;} char *Media_NextTrack(int musicchannelnum, float *time) {return NULL;}
qboolean Media_PausedDemo(qboolean fortiming) {return false;} qboolean Media_PausedDemo(qboolean fortiming) {return false;}
int filmtexture; int filmtexture;