Skip to content

Commit 4cdac8a

Browse files
Sackzementicculus
authored andcommitted
Change error return value to -1 and set error messages
1 parent fb3f10b commit 4cdac8a

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

src/SDL_mixer.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,26 +1869,30 @@ SDL_AudioStream *MIX_GetTrackAudioStream(MIX_Track *track)
18691869
Sint64 MIX_MSToFrames(int sample_rate, Sint64 ms)
18701870
{
18711871
if (sample_rate <= 0) {
1872-
return 0;
1872+
SDL_InvalidParamError("sample_rate");
1873+
return -1;
18731874
} else if (ms < 0) {
1874-
return 0;
1875+
SDL_InvalidParamError("ms");
1876+
return -1;
18751877
}
18761878
return (Sint64) ((((double) ms) / 1000.0) * ((double) sample_rate));
18771879
}
18781880

18791881
Sint64 MIX_FramesToMS(int sample_rate, Sint64 frames)
18801882
{
18811883
if (sample_rate <= 0) {
1882-
return 0;
1884+
SDL_InvalidParamError("sample_rate");
1885+
return -1;
18831886
} else if (frames < 0) {
1884-
return 0;
1887+
SDL_InvalidParamError("frames");
1888+
return -1;
18851889
}
18861890
return (Sint64) ((((double) frames) / ((double) sample_rate)) * 1000.0);
18871891
}
18881892

18891893
Sint64 MIX_TrackMSToFrames(MIX_Track *track, Sint64 ms)
18901894
{
1891-
Sint64 retval = 0;
1895+
Sint64 retval = -1;
18921896
if (CheckTrackParam(track)) {
18931897
LockTrack(track);
18941898
SDL_AudioSpec spec;
@@ -1907,7 +1911,7 @@ Sint64 MIX_TrackMSToFrames(MIX_Track *track, Sint64 ms)
19071911

19081912
Sint64 MIX_TrackFramesToMS(MIX_Track *track, Sint64 frames)
19091913
{
1910-
Sint64 retval = 0;
1914+
Sint64 retval = -1;
19111915
if (CheckTrackParam(track)) {
19121916
LockTrack(track);
19131917
SDL_AudioSpec spec;
@@ -1927,15 +1931,15 @@ Sint64 MIX_TrackFramesToMS(MIX_Track *track, Sint64 frames)
19271931
Sint64 MIX_AudioMSToFrames(MIX_Audio *audio, Sint64 ms)
19281932
{
19291933
if (!CheckAudioParam(audio)) {
1930-
return 0;
1934+
return -1;
19311935
}
19321936
return MIX_MSToFrames(audio->spec.freq, ms);
19331937
}
19341938

19351939
Sint64 MIX_AudioFramesToMS(MIX_Audio *audio, Sint64 frames)
19361940
{
19371941
if (!CheckAudioParam(audio)) {
1938-
return 0;
1942+
return -1;
19391943
}
19401944
return MIX_FramesToMS(audio->spec.freq, frames);
19411945
}

0 commit comments

Comments
 (0)