Subversion Repositories eduke32

Rev

Rev 4386 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4386 Rev 4440
Line 56... Line 56...
56
static pid_t external_midi_pid=-1;
56
static pid_t external_midi_pid=-1;
57
static int8_t external_midi_restart=0;
57
static int8_t external_midi_restart=0;
58
#endif
58
#endif
59
59
60
#ifdef __ANDROID__ //TODO fix
60
#ifdef __ANDROID__ //TODO fix
61
static char *external_midi_tempfn = "/sdcard/eduke32-music.mid";
61
static char *external_midi_tempfn = "eduke32-music.mid";
62
#else
62
#else
63
static char *external_midi_tempfn = "/tmp/eduke32-music.mid";
63
static char *external_midi_tempfn = "/tmp/eduke32-music.mid";
64
#endif
64
#endif
65
65
66
static int32_t external_midi = 0;
66
static int32_t external_midi = 0;
Line 126... Line 126...
126
    return(NULL);
126
    return(NULL);
127
} // MUSIC_ErrorString
127
} // MUSIC_ErrorString
128
128
129
int32_t MUSIC_Init(int32_t SoundCard, int32_t Address)
129
int32_t MUSIC_Init(int32_t SoundCard, int32_t Address)
130
{
130
{
-
 
131
#ifdef __ANDROID__
-
 
132
        music_initialized = 1;
-
 
133
        return(MUSIC_Ok);
-
 
134
#endif
131
    // Use an external MIDI player if the user has specified to do so
135
    // Use an external MIDI player if the user has specified to do so
132
    char *command = getenv("EDUKE32_MUSIC_CMD");
136
    char *command = getenv("EDUKE32_MUSIC_CMD");
133
    const SDL_version *linked = Mix_Linked_Version();
137
    const SDL_version *linked = Mix_Linked_Version();
134
138
135
    UNREFERENCED_PARAMETER(SoundCard);
139
    UNREFERENCED_PARAMETER(SoundCard);
Line 448... Line 452...
448
452
449
// Duke3D-specific.  --ryan.
453
// Duke3D-specific.  --ryan.
450
// void MUSIC_PlayMusic(char *_filename)
454
// void MUSIC_PlayMusic(char *_filename)
451
int32_t MUSIC_PlaySong(char *song, int32_t loopflag)
455
int32_t MUSIC_PlaySong(char *song, int32_t loopflag)
452
{
456
{
-
 
457
//      initprintf("MUSIC_PlaySong");
453
    MUSIC_StopSong();
458
    MUSIC_StopSong();
454
459
455
    if (external_midi)
460
    if (external_midi)
456
    {
461
    {
457
        FILE *fp;
462
        FILE *fp;