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