Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Use getStreamUrl() method for video urls. 

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
Yahor Berdnikau 2017-11-21 21:25:36 +01:00
parent 6503ce2e4c
commit c4f28280f9
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java
View File

@ -104,6 +104,8 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import kotlin.Pair;
import retrofit2.Response;
@ -739,12 +741,30 @@ public class RESTMusicService implements MusicService {
}
@Override
public String getVideoUrl(Context context, String id, boolean useFlash) throws Exception {
public String getVideoUrl(final Context context,
final String id,
final boolean useFlash) throws Exception {
// This method should not exists as video should be loaded using stream method
// Previous method implementation uses assumption that video will be available
// by videoPlayer.view?id=<id>&maxBitRate=500&autoplay=true, but this url is not
// official Subsonic API call.
throw new UnsupportedOperationException("This method is not longer supported");
if (id == null) {
throw new IllegalArgumentException("Id is null");
}
final String[] expectedResult = new String[1];
expectedResult[0] = null;
final CountDownLatch latch = new CountDownLatch(1);
new Thread(new Runnable() {
@Override
public void run() {
expectedResult[0] = subsonicAPIClient.getStreamUrl(id) + "&format=raw";
latch.countDown();
}
}, "Get-Video-Url").start();
latch.await(3, TimeUnit.SECONDS);
return expectedResult[0];
}
@Override