From 93c478ad22bd9e6cec713ba91001d92c185fed4f Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Fri, 28 Dec 2007 02:24:54 +1100 Subject: [PATCH] src/command.c : Add Ogg/Vorbis to 'get format' commands. --- ChangeLog | 3 +++ src/command.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 785b6398..aa40533f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,9 @@ * src/wav.c tests/header_test.tpl Apply similar fix to above for WAVEX files. + * src/command.c + Add Ogg/Vorbis to 'get format' commands. + 2007-12-16 Erik de Castro Lopo * src/ogg.c diff --git a/src/command.c b/src/command.c index d2b697b4..7f61c22b 100644 --- a/src/command.c +++ b/src/command.c @@ -1,5 +1,5 @@ /* -** Copyright (C) 2001-2004 Erik de Castro Lopo +** Copyright (C) 2001-2007 Erik de Castro Lopo ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU Lesser General Public License as published by @@ -59,6 +59,10 @@ static SF_FORMAT_INFO const simple_formats [] = "OKI Dialogic VOX ADPCM", "vox" }, + { SF_FORMAT_OGG | SF_FORMAT_VORBIS, + "Ogg Vorbis (Xiph Foundation)", "oga" + }, + { SF_FORMAT_WAV | SF_FORMAT_PCM_16, "WAV (Microsoft 16 bit PCM)", "wav" }, @@ -114,6 +118,7 @@ static SF_FORMAT_INFO const major_formats [] = { SF_FORMAT_SVX, "IFF (Amiga IFF/SVX8/SV16)", "iff" }, { SF_FORMAT_MAT4, "MAT4 (GNU Octave 2.0 / Matlab 4.2)", "mat" }, { SF_FORMAT_MAT5, "MAT5 (GNU Octave 2.1 / Matlab 5.0)", "mat" }, + { SF_FORMAT_OGG, "OGG (OGG Container format)", "oga" }, { SF_FORMAT_PAF, "PAF (Ensoniq PARIS)", "paf" }, { SF_FORMAT_PVF, "PVF (Portable Voice Format)", "pvf" }, { SF_FORMAT_RAW, "RAW (header-less)", "raw" }, @@ -179,7 +184,9 @@ static SF_FORMAT_INFO subtype_formats [] = { SF_FORMAT_VOX_ADPCM, "VOX ADPCM", "vox" }, { SF_FORMAT_DPCM_16, "16 bit DPCM", NULL }, - { SF_FORMAT_DPCM_8, "8 bit DPCM", NULL } + { SF_FORMAT_DPCM_8, "8 bit DPCM", NULL }, + + { SF_FORMAT_VORBIS, "Vorbis", NULL }, } ; /* subtype_formats */ int