mirror of
https://github.com/ZDoom/fluidsynth.git
synced 2025-02-24 04:42:03 +00:00
fix for ticket #97 : Latest fluid_midi.c fails to build under MSVC 2010
This commit is contained in:
parent
4b43c085e7
commit
f47d7dcddc
1 changed files with 3 additions and 3 deletions
|
@ -1438,12 +1438,12 @@ fluid_player_load(fluid_player_t *player, fluid_playlist_item *item)
|
||||||
|
|
||||||
if (item->filename != NULL)
|
if (item->filename != NULL)
|
||||||
{
|
{
|
||||||
|
fluid_file fp;
|
||||||
/* This file is specified by filename; load the file from disk */
|
/* This file is specified by filename; load the file from disk */
|
||||||
FLUID_LOG(FLUID_DBG, "%s: %d: Loading midifile %s", __FILE__, __LINE__,
|
FLUID_LOG(FLUID_DBG, "%s: %d: Loading midifile %s", __FILE__, __LINE__,
|
||||||
item->filename);
|
item->filename);
|
||||||
|
|
||||||
/* Read the entire contents of the file into the buffer */
|
/* Read the entire contents of the file into the buffer */
|
||||||
fluid_file fp = FLUID_FOPEN(item->filename, "rb");
|
fp = FLUID_FOPEN(item->filename, "rb");
|
||||||
if (fp == NULL) {
|
if (fp == NULL) {
|
||||||
FLUID_LOG(FLUID_ERR, "Couldn't open the MIDI file");
|
FLUID_LOG(FLUID_ERR, "Couldn't open the MIDI file");
|
||||||
return FLUID_FAILED;
|
return FLUID_FAILED;
|
||||||
|
@ -1461,7 +1461,7 @@ fluid_player_load(fluid_player_t *player, fluid_playlist_item *item)
|
||||||
/* This file is specified by a pre-loaded buffer; load from memory */
|
/* This file is specified by a pre-loaded buffer; load from memory */
|
||||||
FLUID_LOG(FLUID_DBG, "%s: %d: Loading midifile from memory (%p)",
|
FLUID_LOG(FLUID_DBG, "%s: %d: Loading midifile from memory (%p)",
|
||||||
__FILE__, __LINE__, item->buffer);
|
__FILE__, __LINE__, item->buffer);
|
||||||
buffer = item->buffer;
|
buffer = (char *) item->buffer;
|
||||||
buffer_length = item->buffer_len;
|
buffer_length = item->buffer_len;
|
||||||
/* Do not free the buffer (it is owned by the playlist) */
|
/* Do not free the buffer (it is owned by the playlist) */
|
||||||
buffer_owned = 0;
|
buffer_owned = 0;
|
||||||
|
|
Loading…
Reference in a new issue