valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Cleanup comments and NULL-handling in decoders

Browse source
This commit is contained in:
krcroft 2019-11-05 17:22:40 -08:00 • committed by Patryk Obara
parent b932a89f87
commit fd695b0948
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libs/decoders/flac.c
View file

@ -17,7 +17,7 @@
* published by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This SDL_sound Ogg Opus decoder backend is distributed in the hope that it
* This SDL_sound FLAC decoder backend is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.

14
src/libs/decoders/mp3.cpp
View file

@ -90,14 +90,14 @@ static void MP3_close(Sound_Sample* const sample)
{
Sound_SampleInternal* const internal = static_cast<Sound_SampleInternal* const>(sample->opaque);
mp3_t* p_mp3 = static_cast<mp3_t*>(internal->decoder_private);
if (p_mp3 != NULL) {
if (p_mp3->p_dr != NULL) {
if (p_mp3 != nullptr) {
if (p_mp3->p_dr != nullptr) {
drmp3_uninit(p_mp3->p_dr);
SDL_free(p_mp3->p_dr);
}
// maps and vector destructors free their memory
SDL_free(p_mp3);
internal->decoder_private = NULL;
internal->decoder_private = nullptr;
}
} /* MP3_close */
@ -147,10 +147,10 @@ static Sint32 MP3_open(Sound_Sample* const sample, const char* const ext)
Sound_SampleInternal* const internal = static_cast<Sound_SampleInternal*>(sample->opaque);
Sint32 result(0); // assume failure until proven otherwise
mp3_t* p_mp3 = (mp3_t*) SDL_calloc(1, sizeof (mp3_t));
if (p_mp3 != NULL) {
if (p_mp3 != nullptr) {
p_mp3->p_dr = (drmp3*) SDL_calloc(1, sizeof (drmp3));
if (p_mp3->p_dr != NULL) {
result = drmp3_init(p_mp3->p_dr, mp3_read, mp3_seek, sample, NULL, NULL);
if (p_mp3->p_dr != nullptr) {
result = drmp3_init(p_mp3->p_dr, mp3_read, mp3_seek, sample, nullptr, nullptr);
if (result == DRMP3_TRUE) {
SNDDBG(("MP3: Accepting data stream.\n"));
sample->flags = SOUND_SAMPLEFLAG_CANSEEK;
@ -199,7 +199,7 @@ static Sint32 MP3_seek(Sound_Sample* const sample, const Uint32 ms)
} /* MP3_seek */
/* dr_mp3 will play layer 1 and 2 files, too */
static const char* extensions_mp3[] = { "MP3", "MP2", "MP1", NULL };
static const char* extensions_mp3[] = { "MP3", "MP2", "MP1", nullptr };
extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MP3 = {
{

7
src/libs/decoders/vorbis.c
View file

@ -17,10 +17,9 @@
* published by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This SDL_sound Ogg Opus decoder backend is distributed in the hope that it
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* This decoder backend is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with the SDL Sound Library. If not, see <http://www.gnu.org/licenses/>.