greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop

Browse Source
This commit is contained in:
Stefan Schüller 2019-01-04 23:32:44 +01:00
commit 64deb952d9
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
View File

@ -184,8 +184,9 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
torrentStream.addListener(new TorrentListener() { torrentStream.addListener(new TorrentListener() {
@Override @Override
public void onStreamReady(Torrent torrent) { public void onStreamReady(Torrent torrent) {
Log.d(TAG, "Ready"); String videopath = Uri.fromFile(torrent.getVideoFile()).toString();
mService.setCurrentStreamUrl(Uri.fromFile(torrent.getVideoFile()).toString()); Log.d(TAG, "Ready! torrentStream videopath:" + videopath);
mService.setCurrentStreamUrl(videopath);
startPlayer(); startPlayer();
} }

9
app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
View File

@ -35,6 +35,7 @@ import androidx.annotation.Nullable;
import android.support.v4.media.MediaDescriptionCompat; import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.session.MediaSessionCompat; import android.support.v4.media.session.MediaSessionCompat;
import android.util.Log; import android.util.Log;
import android.widget.Toast;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.ExoPlayerFactory;
@ -82,6 +83,8 @@ public class VideoPlayerService extends Service {
@Override @Override
public void onCreate() { public void onCreate() {
Log.v(TAG, "onCreate...");
super.onCreate(); super.onCreate();
player = ExoPlayerFactory.newSimpleInstance(getApplicationContext(), new DefaultTrackSelector()); player = ExoPlayerFactory.newSimpleInstance(getApplicationContext(), new DefaultTrackSelector());
@ -136,7 +139,11 @@ public class VideoPlayerService extends Service {
@Override @Override
public int onStartCommand(Intent intent, int flags, int startId) { public int onStartCommand(Intent intent, int flags, int startId) {
Context context = this;
Log.v(TAG, "onStartCommand..."); Log.v(TAG, "onStartCommand...");
if(currentStreamUrl == null){
Toast.makeText(context, "currentStreamUrl must not null", Toast.LENGTH_SHORT).show();
}
playVideo(); playVideo();
return START_STICKY; return START_STICKY;
} }
@ -150,7 +157,7 @@ public class VideoPlayerService extends Service {
public void setCurrentStreamUrl(String streamUrl) public void setCurrentStreamUrl(String streamUrl)
{ {
Log.v(TAG, "setCurrentStreamUrl..."); Log.v(TAG, "setCurrentStreamUrl..." + streamUrl);
currentStreamUrl = streamUrl; currentStreamUrl = streamUrl;
} }