diff --git a/src/formats.c b/src/formats.c index 2aaa5b21..6312dcb6 100644 --- a/src/formats.c +++ b/src/formats.c @@ -519,7 +519,7 @@ static const coding_info coding_info_list[] = { {coding_CRI_HCA, "CRI HCA"}, #ifdef VGM_USE_VORBIS - {coding_ogg_vorbis, "Ogg Vorbis"}, + {coding_OGG_VORBIS, "Ogg Vorbis"}, {coding_VORBIS_custom, "Custom Vorbis"}, #endif #ifdef VGM_USE_MPEG diff --git a/src/meta/ogg_vorbis.c b/src/meta/ogg_vorbis.c index 0c680e3e..145d5b32 100644 --- a/src/meta/ogg_vorbis.c +++ b/src/meta/ogg_vorbis.c @@ -455,7 +455,7 @@ VGMSTREAM * init_vgmstream_ogg_vorbis_callbacks(STREAMFILE *streamFile, const ch vgmstream->loop_end_sample = vgmstream->num_samples; } - vgmstream->coding_type = coding_ogg_vorbis; + vgmstream->coding_type = coding_OGG_VORBIS; vgmstream->layout_type = vgm_inf->layout_type; vgmstream->meta_type = vgm_inf->meta_type; diff --git a/src/meta/riff.c b/src/meta/riff.c index 969ee083..4973e1d2 100644 --- a/src/meta/riff.c +++ b/src/meta/riff.c @@ -163,7 +163,7 @@ static int read_fmt(int big_endian, STREAMFILE * streamFile, off_t current_chunk #ifdef VGM_USE_VORBIS case 0x6771: /* Ogg Vorbis (mode 3+) */ - fmt->coding_type = coding_ogg_vorbis; + fmt->coding_type = coding_OGG_VORBIS; break; #else goto fail; @@ -423,7 +423,7 @@ VGMSTREAM * init_vgmstream_riff(STREAMFILE *streamFile) { #ifdef VGM_USE_VORBIS /* special case using init_vgmstream_ogg_vorbis */ - if (fmt.coding_type == coding_ogg_vorbis) { + if (fmt.coding_type == coding_OGG_VORBIS) { return parse_riff_ogg(streamFile, start_offset, data_size); } #endif diff --git a/src/vgmstream.c b/src/vgmstream.c index af68f893..7a9ab724 100644 --- a/src/vgmstream.c +++ b/src/vgmstream.c @@ -503,7 +503,7 @@ void reset_vgmstream(VGMSTREAM * vgmstream) { * really hit the loop start. */ #ifdef VGM_USE_VORBIS - if (vgmstream->coding_type==coding_ogg_vorbis) { + if (vgmstream->coding_type==coding_OGG_VORBIS) { reset_ogg_vorbis(vgmstream); } @@ -689,7 +689,7 @@ void close_vgmstream(VGMSTREAM * vgmstream) { return; #ifdef VGM_USE_VORBIS - if (vgmstream->coding_type==coding_ogg_vorbis) { + if (vgmstream->coding_type==coding_OGG_VORBIS) { free_ogg_vorbis(vgmstream->codec_data); vgmstream->codec_data = NULL; } @@ -1038,7 +1038,7 @@ int get_vgmstream_samples_per_frame(VGMSTREAM * vgmstream) { case coding_PCMFLOAT: return 1; #ifdef VGM_USE_VORBIS - case coding_ogg_vorbis: + case coding_OGG_VORBIS: case coding_VORBIS_custom: #endif #ifdef VGM_USE_MPEG @@ -1636,7 +1636,7 @@ void decode_vgmstream(VGMSTREAM * vgmstream, int samples_written, int samples_to } break; #ifdef VGM_USE_VORBIS - case coding_ogg_vorbis: + case coding_OGG_VORBIS: decode_ogg_vorbis(vgmstream->codec_data, buffer+samples_written*vgmstream->channels,samples_to_do, vgmstream->channels); @@ -2019,7 +2019,7 @@ int vgmstream_do_loop(VGMSTREAM * vgmstream) { } #ifdef VGM_USE_VORBIS - if (vgmstream->coding_type==coding_ogg_vorbis) { + if (vgmstream->coding_type==coding_OGG_VORBIS) { seek_ogg_vorbis(vgmstream, vgmstream->loop_sample); } @@ -2429,7 +2429,7 @@ static int get_vgmstream_average_bitrate_channel_count(VGMSTREAM * vgmstream) return (data) ? data->substream_count : 0; } #ifdef VGM_USE_VORBIS - if (vgmstream->coding_type==coding_ogg_vorbis) { + if (vgmstream->coding_type==coding_OGG_VORBIS) { ogg_vorbis_codec_data *data = (ogg_vorbis_codec_data *) vgmstream->codec_data; return (data) ? 1 : 0; } @@ -2463,7 +2463,7 @@ static STREAMFILE * get_vgmstream_average_bitrate_channel_streamfile(VGMSTREAM * return data->intfiles[channel]; } #ifdef VGM_USE_VORBIS - if (vgmstream->coding_type==coding_ogg_vorbis) { + if (vgmstream->coding_type==coding_OGG_VORBIS) { ogg_vorbis_codec_data *data = (ogg_vorbis_codec_data *) vgmstream->codec_data; return data->ov_streamfile.streamfile; } diff --git a/src/vgmstream.h b/src/vgmstream.h index f46c241b..5c57fa6a 100644 --- a/src/vgmstream.h +++ b/src/vgmstream.h @@ -172,7 +172,7 @@ typedef enum { coding_CRI_HCA, /* CRI High Compression Audio (MDCT-based) */ #ifdef VGM_USE_VORBIS - coding_ogg_vorbis, /* Xiph Vorbis with Ogg layer (MDCT-based) */ + coding_OGG_VORBIS, /* Xiph Vorbis with Ogg layer (MDCT-based) */ coding_VORBIS_custom, /* Xiph Vorbis with custom layer (MDCT-based) */ #endif