Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2025-02-17 05:28:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename new playback classes

Browse source
This commit is contained in:
Felix 2017-04-04 01:33:30 +02:00
parent a7c4496391
commit 5f17766fc8
6 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -40,7 +40,7 @@
<activity android:name=".activities.DetailsActivity"
android:exported="true"
android:theme="@style/Theme.Leanback"/>
<activity android:name=".activities.ExoPlayerActivity"
<activity android:name=".activities.PlayerActivity"
android:theme="@style/Theme.Leanback"/>
<service android:name=".network.MediaApiService"/>

16
app/src/main/java/de/nicidienase/chaosflix/PlaybackHelper.java
View file

@ -28,7 +28,7 @@ import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.recording.Recording;
import de.nicidienase.chaosflix.entities.streaming.Room;
import de.nicidienase.chaosflix.entities.streaming.StreamUrl;
import de.nicidienase.chaosflix.fragments.ExoOverlayFragment;
import de.nicidienase.chaosflix.fragments.OverlayFragment;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
@ -45,11 +45,11 @@ public class PlaybackHelper extends PlaybackControlGlue {
private static final int UPDATE_PERIOD = 16;
private static final String TAG = PlaybackHelper.class.getSimpleName();
private Disposable thumbDisposable;
private ExoOverlayFragment.PlaybackControlListener mControlListener;
private OverlayFragment.PlaybackControlListener mControlListener;
private BitmapDrawable mDrawable = null;
private Room room;
private StreamUrl stream;
private ExoOverlayFragment fragment;
private OverlayFragment fragment;
private Event event;
private Recording recording;
private Runnable mUpdateProgressRunnable;
@ -60,15 +60,15 @@ public class PlaybackHelper extends PlaybackControlGlue {
PlaybackControlsRow.RewindAction mRewindAction;
PlaybackControlsRow.SkipNextAction mSkipNextAction;
PlaybackControlsRow.SkipPreviousAction mSkipPreviousAction;
private ExoOverlayFragment.PlaybackControlListener mCallback;
private OverlayFragment.PlaybackControlListener mCallback;
private MediaController mMediaController;
private MediaController.TransportControls mTransportControls;
private ArrayObjectAdapter adapter;
public PlaybackHelper(Context context, ExoOverlayFragment fragment, Event event, Recording recording){
public PlaybackHelper(Context context, OverlayFragment fragment, Event event, Recording recording){
super(context,SEEK_SPEEDS);
mControlListener = (ExoOverlayFragment.PlaybackControlListener) context;
mControlListener = (OverlayFragment.PlaybackControlListener) context;
this.fragment = fragment;
this.event = event;
this.recording = recording;
@ -88,9 +88,9 @@ public class PlaybackHelper extends PlaybackControlGlue {
setup();
}
public PlaybackHelper(Context context, ExoOverlayFragment fragment, Room room, StreamUrl stream ){
public PlaybackHelper(Context context, OverlayFragment fragment, Room room, StreamUrl stream ){
super(context, SEEK_SPEEDS);
mControlListener = (ExoOverlayFragment.PlaybackControlListener) context;
mControlListener = (OverlayFragment.PlaybackControlListener) context;
this.fragment = fragment;
this.room = room;
this.stream = stream;

20
app/src/main/java/de/nicidienase/chaosflix/activities/ExoPlayerActivity.java → app/src/main/java/de/nicidienase/chaosflix/activities/PlayerActivity.java
View file

@ -1,17 +1,12 @@
package de.nicidienase.chaosflix.activities;
import android.content.Context;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.Nullable;
import android.support.v4.os.BuildCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.SurfaceView;
import android.view.View;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.DefaultLoadControl;
@ -29,7 +24,6 @@ import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.trackselection.TrackSelection;
import com.google.android.exoplayer2.trackselection.TrackSelector;
import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
@ -40,19 +34,19 @@ import com.google.android.exoplayer2.util.Util;
import butterknife.BindView;
import butterknife.ButterKnife;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.fragments.ExoOverlayFragment;
import de.nicidienase.chaosflix.fragments.OverlayFragment;
/**
* Created by felix on 26.03.17.
*/
public class ExoPlayerActivity extends AbstractServiceConnectedAcitivty
implements ExoOverlayFragment.PlaybackControlListener{
public class PlayerActivity extends AbstractServiceConnectedAcitivty
implements OverlayFragment.PlaybackControlListener{
private static final String TAG = ExoPlayerActivity.class.getSimpleName();
private static final String TAG = PlayerActivity.class.getSimpleName();
@BindView(R.id.videoView)
SurfaceView mSurfaceView;
ExoOverlayFragment mPlaybackControllFragment;
OverlayFragment mPlaybackControllFragment;
private DefaultBandwidthMeter bandwidthMeter;
private SimpleExoPlayer player;
private String mUserAgent;
@ -64,10 +58,10 @@ public class ExoPlayerActivity extends AbstractServiceConnectedAcitivty
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.exoplayback_activity);
setContentView(R.layout.activity_playback);
ButterKnife.bind(this);
mPlaybackControllFragment = (ExoOverlayFragment) getFragmentManager().findFragmentById(R.id.playback_controls_fragment);
mPlaybackControllFragment = (OverlayFragment) getFragmentManager().findFragmentById(R.id.playback_controls_fragment);
mUserAgent = Util.getUserAgent(this, getResources().getString(R.string.app_name));
synchronized (this){

4
app/src/main/java/de/nicidienase/chaosflix/fragments/EventsDetailsFragment.java
View file

@ -38,7 +38,7 @@ import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedAcitivty;
import de.nicidienase.chaosflix.activities.DetailsActivity;
import de.nicidienase.chaosflix.activities.EventDetailsActivity;
import de.nicidienase.chaosflix.activities.ExoPlayerActivity;
import de.nicidienase.chaosflix.activities.PlayerActivity;
import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.recording.Recording;
@ -207,7 +207,7 @@ public class EventsDetailsFragment extends DetailsFragment {
prepareEntranceTransition();
mDetailsPresenter.setOnActionClickedListener(action -> {
Intent i = new Intent(getActivity(), ExoPlayerActivity.class);
Intent i = new Intent(getActivity(), PlayerActivity.class);
i.putExtra(DetailsActivity.TYPE,eventType);
if(eventType == DetailsActivity.TYPE_RECORDING){
i.putExtra(DetailsActivity.EVENT,mSelectedEvent);

4
app/src/main/java/de/nicidienase/chaosflix/fragments/ExoOverlayFragment.java → app/src/main/java/de/nicidienase/chaosflix/fragments/OverlayFragment.java
View file

@ -35,9 +35,9 @@ import static android.support.v4.media.session.MediaSessionCompat.FLAG_HANDLES_T
* Created by felix on 26.03.17.
*/
public class ExoOverlayFragment extends PlaybackFragment{
public class OverlayFragment extends PlaybackFragment{
private static final String TAG = ExoOverlayFragment.class.getSimpleName();
private static final String TAG = OverlayFragment.class.getSimpleName();
private Recording mSelectedRecording;
private Event mSelectedEvent;

2
app/src/main/res/layout/exoplayback_activity.xml → app/src/main/res/layout/activity_playback.xml
View file

@ -10,7 +10,7 @@
android:layout_gravity="center"/>
<fragment
android:name="de.nicidienase.chaosflix.fragments.ExoOverlayFragment"
android:name="de.nicidienase.chaosflix.fragments.OverlayFragment"
android:id="@+id/playback_controls_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"/>