SecT0uch
/
Kore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added ability to play media files locally (#125)

This commit is contained in:
alexander 2020-01-10 13:01:56 +03:00 committed by Martijn Brekhof
parent dcdac90faa
commit 1977600a54
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/xbmc/kore/ui/sections/file/MediaFileListFragment.java
View File

@ -17,10 +17,12 @@ package org.xbmc.kore.ui.sections.file;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.net.Uri;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -47,6 +49,7 @@ import org.xbmc.kore.ui.viewgroups.RecyclerViewEmptyViewSupport;
import org.xbmc.kore.utils.LogUtils; import org.xbmc.kore.utils.LogUtils;
import org.xbmc.kore.utils.UIUtils; import org.xbmc.kore.utils.UIUtils;
import org.xbmc.kore.utils.Utils; import org.xbmc.kore.utils.Utils;
import org.xbmc.kore.utils.FileDownloadHelper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
@ -378,6 +381,26 @@ public class MediaFileListFragment extends AbstractListFragment {
}, callbackHandler); }, callbackHandler);
} }
/**
* Starts playing the given media file on the local device
* @param filename Filename to start playing
*/
private void playMediaFileLocally(final String filename) {
FileDownloadHelper.MovieInfo movieDownloadInfo = new FileDownloadHelper.MovieInfo(null, filename);
Uri uri = Uri.parse(movieDownloadInfo.getMediaUrl(hostManager.getHostInfo()));
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
if (mediaType.equalsIgnoreCase(Files.Media.VIDEO)) {
intent.setDataAndType(uri, "video/*");
} else if (mediaType.equalsIgnoreCase(Files.Media.MUSIC)) {
intent.setDataAndType(uri, "audio/*");
} else if (mediaType.equalsIgnoreCase(Files.Media.PICTURES)) {
intent.setDataAndType(uri, "image/*");
} else {
intent.setDataAndType(uri, "application/*");
}
startActivity(intent);
}
/** /**
* Queues the given media file on the active playlist, and starts it if nothing is playing * Queues the given media file on the active playlist, and starts it if nothing is playing
* @param filename File to queue * @param filename File to queue
@ -524,6 +547,9 @@ public class MediaFileListFragment extends AbstractListFragment {
case R.id.action_play_item: case R.id.action_play_item:
playMediaFile(loc.file); playMediaFile(loc.file);
return true; return true;
case R.id.action_play_local_item:
playMediaFileLocally(loc.file);
return true;
case R.id.action_play_from_this_item: case R.id.action_play_from_this_item:
mediaQueueFileLocation.clear(); mediaQueueFileLocation.clear();
FileLocation fl; FileLocation fl;

8
app/src/main/res/menu/filelist_item.xml
View File

@ -24,8 +24,12 @@
android:title="@string/play_file" android:title="@string/play_file"
android:orderInCategory="2" android:orderInCategory="2"
app:showAsAction="never" /> app:showAsAction="never" />
<item android:id="@+id/action_play_from_this_item" <item android:id="@+id/action_play_local_item"
android:title="@string/play_from_here" android:title="@string/play_locally"
android:orderInCategory="3" android:orderInCategory="3"
app:showAsAction="never" /> app:showAsAction="never" />
<item android:id="@+id/action_play_from_this_item"
android:title="@string/play_from_here"
android:orderInCategory="4"
app:showAsAction="never" />
</menu> </menu>