Ignore:
Timestamp:
Jul 20, 2010, 5:46:55 PM (15 years ago)
Author:
David Azarewicz
Message:

Some of my updates from the 2.1.x branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • GPL/trunk/lib32/fminstrload.c

    r305 r518  
    4242#include "instrfm.h"
    4343
    44 #define assert(a)   
     44#define assert(a)
    4545
    4646typedef struct sbi_header
     
    101101{
    102102    midihandle  *pHandle = (midihandle *)streamid;
    103    
     103
    104104    if(pHandle == NULL || pHandle->magic != MAGIC_MIDI_ALSA32) {
    105105        DebugInt3();
     
    119119    //load drums
    120120    load_sb(pHandle, drumsopl3, sizeof(drumsopl3), 128);
    121    
     121
    122122    return OSSERR_SUCCESS;
    123123}
     
    226226 * Parse standard .sb or .o3 file
    227227 */
    228 static void load_sb (midihandle *pHandle, char *pFile, int filesize, int bank) 
     228static void load_sb (midihandle *pHandle, char *pFile, int filesize, int bank)
    229229{
    230230    int len, i, offset = 0;
     
    245245        if (!strncmp (sbi_instr.header.key, "SBI\032", 4) || !strncmp (sbi_instr.header.key, "2OP\032", 4)) {
    246246            fm_instr_type = FM_PATCH_OPL2;
    247         } 
    248         else 
     247        }
     248        else
    249249        if (!strncmp (sbi_instr.header.key, "4OP\032", 4)) {
    250250            fm_instr_type = FM_PATCH_OPL3;
    251         } 
     251        }
    252252        else {
    253253            fm_instr_type = 0;
     
    374374    memset(*ptr, 0, sizeof(snd_instr_header_t) + len);
    375375        (*ptr)->len = len;
    376          
     376
    377377        return 0;
    378378}
Note: See TracChangeset for help on using the changeset viewer.