Skip to content

Commit cde4413

Browse files
committed
Change error return value to -1 and set error messages
1 parent 43382a1 commit cde4413

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
@@ -1865,26 +1865,30 @@ SDL_AudioStream *MIX_GetTrackAudioStream(MIX_Track *track)
18651865
Sint64 MIX_MSToFrames(int sample_rate, Sint64 ms)
18661866
{
18671867
if (sample_rate <= 0) {
1868-
return 0;
1868+
SDL_InvalidParamError("sample_rate");
1869+
return -1;
18691870
} else if (ms < 0) {
1870-
return 0;
1871+
SDL_InvalidParamError("ms");
1872+
return -1;
18711873
}
18721874
return (Sint64) ((((double) ms) / 1000.0) * ((double) sample_rate));
18731875
}
18741876

18751877
Sint64 MIX_FramesToMS(int sample_rate, Sint64 frames)
18761878
{
18771879
if (sample_rate <= 0) {
1878-
return 0;
1880+
SDL_InvalidParamError("sample_rate");
1881+
return -1;
18791882
} else if (frames < 0) {
1880-
return 0;
1883+
SDL_InvalidParamError("frames");
1884+
return -1;
18811885
}
18821886
return (Sint64) ((((double) frames) / ((double) sample_rate)) * 1000.0);
18831887
}
18841888

18851889
Sint64 MIX_TrackMSToFrames(MIX_Track *track, Sint64 ms)
18861890
{
1887-
Sint64 retval = 0;
1891+
Sint64 retval = -1;
18881892
if (CheckTrackParam(track)) {
18891893
LockTrack(track);
18901894
SDL_AudioSpec spec;
@@ -1903,7 +1907,7 @@ Sint64 MIX_TrackMSToFrames(MIX_Track *track, Sint64 ms)
19031907

19041908
Sint64 MIX_TrackFramesToMS(MIX_Track *track, Sint64 frames)
19051909
{
1906-
Sint64 retval = 0;
1910+
Sint64 retval = -1;
19071911
if (CheckTrackParam(track)) {
19081912
LockTrack(track);
19091913
SDL_AudioSpec spec;
@@ -1923,15 +1927,15 @@ Sint64 MIX_TrackFramesToMS(MIX_Track *track, Sint64 frames)
19231927
Sint64 MIX_AudioMSToFrames(MIX_Audio *audio, Sint64 ms)
19241928
{
19251929
if (!CheckAudioParam(audio)) {
1926-
return 0;
1930+
return -1;
19271931
}
19281932
return MIX_MSToFrames(audio->spec.freq, ms);
19291933
}
19301934

19311935
Sint64 MIX_AudioFramesToMS(MIX_Audio *audio, Sint64 frames)
19321936
{
19331937
if (!CheckAudioParam(audio)) {
1934-
return 0;
1938+
return -1;
19351939
}
19361940
return MIX_FramesToMS(audio->spec.freq, frames);
19371941
}

0 commit comments

Comments
 (0)