@@ -1869,26 +1869,30 @@ SDL_AudioStream *MIX_GetTrackAudioStream(MIX_Track *track)
1869
1869
Sint64 MIX_MSToFrames (int sample_rate , Sint64 ms )
1870
1870
{
1871
1871
if (sample_rate <= 0 ) {
1872
- return 0 ;
1872
+ SDL_InvalidParamError ("sample_rate" );
1873
+ return -1 ;
1873
1874
} else if (ms < 0 ) {
1874
- return 0 ;
1875
+ SDL_InvalidParamError ("ms" );
1876
+ return -1 ;
1875
1877
}
1876
1878
return (Sint64 ) ((((double ) ms ) / 1000.0 ) * ((double ) sample_rate ));
1877
1879
}
1878
1880
1879
1881
Sint64 MIX_FramesToMS (int sample_rate , Sint64 frames )
1880
1882
{
1881
1883
if (sample_rate <= 0 ) {
1882
- return 0 ;
1884
+ SDL_InvalidParamError ("sample_rate" );
1885
+ return -1 ;
1883
1886
} else if (frames < 0 ) {
1884
- return 0 ;
1887
+ SDL_InvalidParamError ("frames" );
1888
+ return -1 ;
1885
1889
}
1886
1890
return (Sint64 ) ((((double ) frames ) / ((double ) sample_rate )) * 1000.0 );
1887
1891
}
1888
1892
1889
1893
Sint64 MIX_TrackMSToFrames (MIX_Track * track , Sint64 ms )
1890
1894
{
1891
- Sint64 retval = 0 ;
1895
+ Sint64 retval = -1 ;
1892
1896
if (CheckTrackParam (track )) {
1893
1897
LockTrack (track );
1894
1898
SDL_AudioSpec spec ;
@@ -1907,7 +1911,7 @@ Sint64 MIX_TrackMSToFrames(MIX_Track *track, Sint64 ms)
1907
1911
1908
1912
Sint64 MIX_TrackFramesToMS (MIX_Track * track , Sint64 frames )
1909
1913
{
1910
- Sint64 retval = 0 ;
1914
+ Sint64 retval = -1 ;
1911
1915
if (CheckTrackParam (track )) {
1912
1916
LockTrack (track );
1913
1917
SDL_AudioSpec spec ;
@@ -1927,15 +1931,15 @@ Sint64 MIX_TrackFramesToMS(MIX_Track *track, Sint64 frames)
1927
1931
Sint64 MIX_AudioMSToFrames (MIX_Audio * audio , Sint64 ms )
1928
1932
{
1929
1933
if (!CheckAudioParam (audio )) {
1930
- return 0 ;
1934
+ return -1 ;
1931
1935
}
1932
1936
return MIX_MSToFrames (audio -> spec .freq , ms );
1933
1937
}
1934
1938
1935
1939
Sint64 MIX_AudioFramesToMS (MIX_Audio * audio , Sint64 frames )
1936
1940
{
1937
1941
if (!CheckAudioParam (audio )) {
1938
- return 0 ;
1942
+ return -1 ;
1939
1943
}
1940
1944
return MIX_FramesToMS (audio -> spec .freq , frames );
1941
1945
}
0 commit comments