mirror of
				https://github.com/TeamNewPipe/NewPipe
				synced 2025-10-31 15:23:00 +00:00 
			
		
		
		
	rename playlist to player.playqueue
This commit is contained in:
		| @@ -32,10 +32,10 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException; | |||||||
| import org.schabi.newpipe.extractor.playlist.PlaylistInfo; | import org.schabi.newpipe.extractor.playlist.PlaylistInfo; | ||||||
| import org.schabi.newpipe.extractor.stream.StreamInfo; | import org.schabi.newpipe.extractor.stream.StreamInfo; | ||||||
| import org.schabi.newpipe.player.helper.PlayerHelper; | import org.schabi.newpipe.player.helper.PlayerHelper; | ||||||
| import org.schabi.newpipe.playlist.ChannelPlayQueue; | import org.schabi.newpipe.playqueue.ChannelPlayQueue; | ||||||
| import org.schabi.newpipe.playlist.PlayQueue; | import org.schabi.newpipe.playqueue.PlayQueue; | ||||||
| import org.schabi.newpipe.playlist.PlaylistPlayQueue; | import org.schabi.newpipe.playqueue.PlaylistPlayQueue; | ||||||
| import org.schabi.newpipe.playlist.SinglePlayQueue; | import org.schabi.newpipe.playqueue.SinglePlayQueue; | ||||||
| import org.schabi.newpipe.report.UserAction; | import org.schabi.newpipe.report.UserAction; | ||||||
| import org.schabi.newpipe.util.ExtractorHelper; | import org.schabi.newpipe.util.ExtractorHelper; | ||||||
| import org.schabi.newpipe.util.NavigationHelper; | import org.schabi.newpipe.util.NavigationHelper; | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ import android.arch.persistence.room.PrimaryKey; | |||||||
| import org.schabi.newpipe.extractor.stream.StreamInfo; | import org.schabi.newpipe.extractor.stream.StreamInfo; | ||||||
| import org.schabi.newpipe.extractor.stream.StreamInfoItem; | import org.schabi.newpipe.extractor.stream.StreamInfoItem; | ||||||
| import org.schabi.newpipe.extractor.stream.StreamType; | import org.schabi.newpipe.extractor.stream.StreamType; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
| import org.schabi.newpipe.util.Constants; | import org.schabi.newpipe.util.Constants; | ||||||
|  |  | ||||||
| import java.io.Serializable; | import java.io.Serializable; | ||||||
|   | |||||||
| @@ -71,8 +71,8 @@ import org.schabi.newpipe.player.MainVideoPlayer; | |||||||
| import org.schabi.newpipe.player.PopupVideoPlayer; | import org.schabi.newpipe.player.PopupVideoPlayer; | ||||||
| import org.schabi.newpipe.player.helper.PlayerHelper; | import org.schabi.newpipe.player.helper.PlayerHelper; | ||||||
| import org.schabi.newpipe.player.old.PlayVideoActivity; | import org.schabi.newpipe.player.old.PlayVideoActivity; | ||||||
| import org.schabi.newpipe.playlist.PlayQueue; | import org.schabi.newpipe.playqueue.PlayQueue; | ||||||
| import org.schabi.newpipe.playlist.SinglePlayQueue; | import org.schabi.newpipe.playqueue.SinglePlayQueue; | ||||||
| import org.schabi.newpipe.report.UserAction; | import org.schabi.newpipe.report.UserAction; | ||||||
| import org.schabi.newpipe.util.Constants; | import org.schabi.newpipe.util.Constants; | ||||||
| import org.schabi.newpipe.util.ExtractorHelper; | import org.schabi.newpipe.util.ExtractorHelper; | ||||||
|   | |||||||
| @@ -24,7 +24,7 @@ import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog; | |||||||
| import org.schabi.newpipe.local.history.HistoryInfoItem; | import org.schabi.newpipe.local.history.HistoryInfoItem; | ||||||
| import org.schabi.newpipe.info_list.InfoItemDialog; | import org.schabi.newpipe.info_list.InfoItemDialog; | ||||||
| import org.schabi.newpipe.info_list.InfoListAdapter; | import org.schabi.newpipe.info_list.InfoListAdapter; | ||||||
| import org.schabi.newpipe.playlist.SinglePlayQueue; | import org.schabi.newpipe.playqueue.SinglePlayQueue; | ||||||
| import org.schabi.newpipe.util.NavigationHelper; | import org.schabi.newpipe.util.NavigationHelper; | ||||||
| import org.schabi.newpipe.util.OnClickGesture; | import org.schabi.newpipe.util.OnClickGesture; | ||||||
| import org.schabi.newpipe.util.StateSaver; | import org.schabi.newpipe.util.StateSaver; | ||||||
|   | |||||||
| @@ -36,9 +36,9 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem; | |||||||
| import org.schabi.newpipe.fragments.list.BaseListInfoFragment; | import org.schabi.newpipe.fragments.list.BaseListInfoFragment; | ||||||
| import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog; | import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog; | ||||||
| import org.schabi.newpipe.info_list.InfoItemDialog; | import org.schabi.newpipe.info_list.InfoItemDialog; | ||||||
| import org.schabi.newpipe.playlist.ChannelPlayQueue; | import org.schabi.newpipe.playqueue.ChannelPlayQueue; | ||||||
| import org.schabi.newpipe.playlist.PlayQueue; | import org.schabi.newpipe.playqueue.PlayQueue; | ||||||
| import org.schabi.newpipe.playlist.SinglePlayQueue; | import org.schabi.newpipe.playqueue.SinglePlayQueue; | ||||||
| import org.schabi.newpipe.report.UserAction; | import org.schabi.newpipe.report.UserAction; | ||||||
| import org.schabi.newpipe.local.subscription.SubscriptionService; | import org.schabi.newpipe.local.subscription.SubscriptionService; | ||||||
| import org.schabi.newpipe.util.AnimationUtils; | import org.schabi.newpipe.util.AnimationUtils; | ||||||
|   | |||||||
| @@ -31,9 +31,9 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem; | |||||||
| import org.schabi.newpipe.fragments.list.BaseListInfoFragment; | import org.schabi.newpipe.fragments.list.BaseListInfoFragment; | ||||||
| import org.schabi.newpipe.local.playlist.RemotePlaylistManager; | import org.schabi.newpipe.local.playlist.RemotePlaylistManager; | ||||||
| import org.schabi.newpipe.info_list.InfoItemDialog; | import org.schabi.newpipe.info_list.InfoItemDialog; | ||||||
| import org.schabi.newpipe.playlist.PlayQueue; | import org.schabi.newpipe.playqueue.PlayQueue; | ||||||
| import org.schabi.newpipe.playlist.PlaylistPlayQueue; | import org.schabi.newpipe.playqueue.PlaylistPlayQueue; | ||||||
| import org.schabi.newpipe.playlist.SinglePlayQueue; | import org.schabi.newpipe.playqueue.SinglePlayQueue; | ||||||
| import org.schabi.newpipe.report.UserAction; | import org.schabi.newpipe.report.UserAction; | ||||||
| import org.schabi.newpipe.util.ExtractorHelper; | import org.schabi.newpipe.util.ExtractorHelper; | ||||||
| import org.schabi.newpipe.util.ImageDisplayConstants; | import org.schabi.newpipe.util.ImageDisplayConstants; | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo; | |||||||
| import org.schabi.newpipe.extractor.stream.StreamInfoItem; | import org.schabi.newpipe.extractor.stream.StreamInfoItem; | ||||||
| import org.schabi.newpipe.fragments.local.LocalItemListAdapter; | import org.schabi.newpipe.fragments.local.LocalItemListAdapter; | ||||||
| import org.schabi.newpipe.local.playlist.LocalPlaylistManager; | import org.schabi.newpipe.local.playlist.LocalPlaylistManager; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
| import org.schabi.newpipe.util.OnClickGesture; | import org.schabi.newpipe.util.OnClickGesture; | ||||||
|  |  | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ package org.schabi.newpipe.fragments.local.history; | |||||||
|  |  | ||||||
| import org.schabi.newpipe.R; | import org.schabi.newpipe.R; | ||||||
| import org.schabi.newpipe.database.stream.StreamStatisticsEntry; | import org.schabi.newpipe.database.stream.StreamStatisticsEntry; | ||||||
| import org.schabi.newpipe.playlist.StatisticsPlaylistFragment; | import org.schabi.newpipe.playqueue.StatisticsPlaylistFragment; | ||||||
|  |  | ||||||
| import java.util.Collections; | import java.util.Collections; | ||||||
| import java.util.List; | import java.util.List; | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ package org.schabi.newpipe.fragments.local.history; | |||||||
|  |  | ||||||
| import org.schabi.newpipe.R; | import org.schabi.newpipe.R; | ||||||
| import org.schabi.newpipe.database.stream.StreamStatisticsEntry; | import org.schabi.newpipe.database.stream.StreamStatisticsEntry; | ||||||
| import org.schabi.newpipe.playlist.StatisticsPlaylistFragment; | import org.schabi.newpipe.playqueue.StatisticsPlaylistFragment; | ||||||
|  |  | ||||||
| import java.util.Collections; | import java.util.Collections; | ||||||
| import java.util.List; | import java.util.List; | ||||||
|   | |||||||
| @@ -28,8 +28,8 @@ import org.schabi.newpipe.database.playlist.PlaylistStreamEntry; | |||||||
| import org.schabi.newpipe.extractor.stream.StreamInfoItem; | import org.schabi.newpipe.extractor.stream.StreamInfoItem; | ||||||
| import org.schabi.newpipe.fragments.local.BaseLocalListFragment; | import org.schabi.newpipe.fragments.local.BaseLocalListFragment; | ||||||
| import org.schabi.newpipe.info_list.InfoItemDialog; | import org.schabi.newpipe.info_list.InfoItemDialog; | ||||||
| import org.schabi.newpipe.playlist.PlayQueue; | import org.schabi.newpipe.playqueue.PlayQueue; | ||||||
| import org.schabi.newpipe.playlist.SinglePlayQueue; | import org.schabi.newpipe.playqueue.SinglePlayQueue; | ||||||
| import org.schabi.newpipe.report.UserAction; | import org.schabi.newpipe.report.UserAction; | ||||||
| import org.schabi.newpipe.util.Localization; | import org.schabi.newpipe.util.Localization; | ||||||
| import org.schabi.newpipe.util.NavigationHelper; | import org.schabi.newpipe.util.NavigationHelper; | ||||||
|   | |||||||
| @@ -48,7 +48,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo; | |||||||
| import org.schabi.newpipe.player.event.PlayerEventListener; | import org.schabi.newpipe.player.event.PlayerEventListener; | ||||||
| import org.schabi.newpipe.player.helper.LockManager; | import org.schabi.newpipe.player.helper.LockManager; | ||||||
| import org.schabi.newpipe.player.helper.PlayerHelper; | import org.schabi.newpipe.player.helper.PlayerHelper; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
| import org.schabi.newpipe.util.ListHelper; | import org.schabi.newpipe.util.ListHelper; | ||||||
| import org.schabi.newpipe.util.NavigationHelper; | import org.schabi.newpipe.util.NavigationHelper; | ||||||
| import org.schabi.newpipe.util.ThemeHelper; | import org.schabi.newpipe.util.ThemeHelper; | ||||||
|   | |||||||
| @@ -69,9 +69,9 @@ import org.schabi.newpipe.player.playback.BasePlayerMediaSession; | |||||||
| import org.schabi.newpipe.player.playback.CustomTrackSelector; | import org.schabi.newpipe.player.playback.CustomTrackSelector; | ||||||
| import org.schabi.newpipe.player.playback.MediaSourceManager; | import org.schabi.newpipe.player.playback.MediaSourceManager; | ||||||
| import org.schabi.newpipe.player.playback.PlaybackListener; | import org.schabi.newpipe.player.playback.PlaybackListener; | ||||||
| import org.schabi.newpipe.playlist.PlayQueue; | import org.schabi.newpipe.playqueue.PlayQueue; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueAdapter; | import org.schabi.newpipe.playqueue.PlayQueueAdapter; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
| import org.schabi.newpipe.util.SerializedCache; | import org.schabi.newpipe.util.SerializedCache; | ||||||
|  |  | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
|   | |||||||
| @@ -62,10 +62,10 @@ import org.schabi.newpipe.extractor.stream.VideoStream; | |||||||
| import org.schabi.newpipe.fragments.OnScrollBelowItemsListener; | import org.schabi.newpipe.fragments.OnScrollBelowItemsListener; | ||||||
| import org.schabi.newpipe.player.helper.PlaybackParameterDialog; | import org.schabi.newpipe.player.helper.PlaybackParameterDialog; | ||||||
| import org.schabi.newpipe.player.helper.PlayerHelper; | import org.schabi.newpipe.player.helper.PlayerHelper; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItemBuilder; | import org.schabi.newpipe.playqueue.PlayQueueItemBuilder; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItemHolder; | import org.schabi.newpipe.playqueue.PlayQueueItemHolder; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItemTouchCallback; | import org.schabi.newpipe.playqueue.PlayQueueItemTouchCallback; | ||||||
| import org.schabi.newpipe.util.AnimationUtils; | import org.schabi.newpipe.util.AnimationUtils; | ||||||
| import org.schabi.newpipe.util.ListHelper; | import org.schabi.newpipe.util.ListHelper; | ||||||
| import org.schabi.newpipe.util.NavigationHelper; | import org.schabi.newpipe.util.NavigationHelper; | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ import android.util.Log; | |||||||
| import com.google.gson.Gson; | import com.google.gson.Gson; | ||||||
| import com.google.gson.JsonSyntaxException; | import com.google.gson.JsonSyntaxException; | ||||||
|  |  | ||||||
| import org.schabi.newpipe.playlist.PlayQueue; | import org.schabi.newpipe.playqueue.PlayQueue; | ||||||
|  |  | ||||||
| import java.io.Serializable; | import java.io.Serializable; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -64,7 +64,7 @@ import org.schabi.newpipe.player.event.PlayerEventListener; | |||||||
| import org.schabi.newpipe.player.helper.LockManager; | import org.schabi.newpipe.player.helper.LockManager; | ||||||
| import org.schabi.newpipe.player.helper.PlayerHelper; | import org.schabi.newpipe.player.helper.PlayerHelper; | ||||||
| import org.schabi.newpipe.player.old.PlayVideoActivity; | import org.schabi.newpipe.player.old.PlayVideoActivity; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
| import org.schabi.newpipe.util.ListHelper; | import org.schabi.newpipe.util.ListHelper; | ||||||
| import org.schabi.newpipe.util.NavigationHelper; | import org.schabi.newpipe.util.NavigationHelper; | ||||||
| import org.schabi.newpipe.util.ThemeHelper; | import org.schabi.newpipe.util.ThemeHelper; | ||||||
|   | |||||||
| @@ -32,11 +32,11 @@ import org.schabi.newpipe.fragments.OnScrollBelowItemsListener; | |||||||
| import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog; | import org.schabi.newpipe.fragments.local.dialog.PlaylistAppendDialog; | ||||||
| import org.schabi.newpipe.player.event.PlayerEventListener; | import org.schabi.newpipe.player.event.PlayerEventListener; | ||||||
| import org.schabi.newpipe.player.helper.PlaybackParameterDialog; | import org.schabi.newpipe.player.helper.PlaybackParameterDialog; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueAdapter; | import org.schabi.newpipe.playqueue.PlayQueueAdapter; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItemBuilder; | import org.schabi.newpipe.playqueue.PlayQueueItemBuilder; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItemHolder; | import org.schabi.newpipe.playqueue.PlayQueueItemHolder; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItemTouchCallback; | import org.schabi.newpipe.playqueue.PlayQueueItemTouchCallback; | ||||||
| import org.schabi.newpipe.util.Localization; | import org.schabi.newpipe.util.Localization; | ||||||
| import org.schabi.newpipe.util.NavigationHelper; | import org.schabi.newpipe.util.NavigationHelper; | ||||||
| import org.schabi.newpipe.util.ThemeHelper; | import org.schabi.newpipe.util.ThemeHelper; | ||||||
|   | |||||||
| @@ -68,7 +68,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfo; | |||||||
| import org.schabi.newpipe.extractor.stream.StreamType; | import org.schabi.newpipe.extractor.stream.StreamType; | ||||||
| import org.schabi.newpipe.extractor.stream.VideoStream; | import org.schabi.newpipe.extractor.stream.VideoStream; | ||||||
| import org.schabi.newpipe.player.helper.PlayerHelper; | import org.schabi.newpipe.player.helper.PlayerHelper; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
| import org.schabi.newpipe.util.AnimationUtils; | import org.schabi.newpipe.util.AnimationUtils; | ||||||
| import org.schabi.newpipe.util.ListHelper; | import org.schabi.newpipe.util.ListHelper; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -24,9 +24,9 @@ import org.schabi.newpipe.extractor.stream.StreamInfo; | |||||||
| import org.schabi.newpipe.extractor.stream.StreamInfoItem; | import org.schabi.newpipe.extractor.stream.StreamInfoItem; | ||||||
| import org.schabi.newpipe.extractor.stream.SubtitlesFormat; | import org.schabi.newpipe.extractor.stream.SubtitlesFormat; | ||||||
| import org.schabi.newpipe.extractor.stream.VideoStream; | import org.schabi.newpipe.extractor.stream.VideoStream; | ||||||
| import org.schabi.newpipe.playlist.PlayQueue; | import org.schabi.newpipe.playqueue.PlayQueue; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
| import org.schabi.newpipe.playlist.SinglePlayQueue; | import org.schabi.newpipe.playqueue.SinglePlayQueue; | ||||||
|  |  | ||||||
| import java.text.DecimalFormat; | import java.text.DecimalFormat; | ||||||
| import java.text.NumberFormat; | import java.text.NumberFormat; | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ import com.google.android.exoplayer2.ExoPlayer; | |||||||
| import com.google.android.exoplayer2.source.MediaPeriod; | import com.google.android.exoplayer2.source.MediaPeriod; | ||||||
| import com.google.android.exoplayer2.upstream.Allocator; | import com.google.android.exoplayer2.upstream.Allocator; | ||||||
|  |  | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
|  |  | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ import com.google.android.exoplayer2.source.MediaPeriod; | |||||||
| import com.google.android.exoplayer2.source.MediaSource; | import com.google.android.exoplayer2.source.MediaSource; | ||||||
| import com.google.android.exoplayer2.upstream.Allocator; | import com.google.android.exoplayer2.upstream.Allocator; | ||||||
|  |  | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
|  |  | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ import android.support.annotation.NonNull; | |||||||
|  |  | ||||||
| import com.google.android.exoplayer2.source.MediaSource; | import com.google.android.exoplayer2.source.MediaSource; | ||||||
|  |  | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
|  |  | ||||||
| public interface ManagedMediaSource extends MediaSource { | public interface ManagedMediaSource extends MediaSource { | ||||||
|     /** |     /** | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ import com.google.android.exoplayer2.ExoPlayer; | |||||||
| import com.google.android.exoplayer2.source.MediaPeriod; | import com.google.android.exoplayer2.source.MediaPeriod; | ||||||
| import com.google.android.exoplayer2.upstream.Allocator; | import com.google.android.exoplayer2.upstream.Allocator; | ||||||
|  |  | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
|  |  | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ import android.support.v4.media.MediaDescriptionCompat; | |||||||
|  |  | ||||||
| import org.schabi.newpipe.player.BasePlayer; | import org.schabi.newpipe.player.BasePlayer; | ||||||
| import org.schabi.newpipe.player.mediasession.MediaSessionCallback; | import org.schabi.newpipe.player.mediasession.MediaSessionCallback; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
|  |  | ||||||
| public class BasePlayerMediaSession implements MediaSessionCallback { | public class BasePlayerMediaSession implements MediaSessionCallback { | ||||||
|     private BasePlayer player; |     private BasePlayer player; | ||||||
|   | |||||||
| @@ -16,12 +16,12 @@ import org.schabi.newpipe.player.mediasource.LoadedMediaSource; | |||||||
| import org.schabi.newpipe.player.mediasource.ManagedMediaSource; | import org.schabi.newpipe.player.mediasource.ManagedMediaSource; | ||||||
| import org.schabi.newpipe.player.mediasource.ManagedMediaSourcePlaylist; | import org.schabi.newpipe.player.mediasource.ManagedMediaSourcePlaylist; | ||||||
| import org.schabi.newpipe.player.mediasource.PlaceholderMediaSource; | import org.schabi.newpipe.player.mediasource.PlaceholderMediaSource; | ||||||
| import org.schabi.newpipe.playlist.PlayQueue; | import org.schabi.newpipe.playqueue.PlayQueue; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
| import org.schabi.newpipe.playlist.events.MoveEvent; | import org.schabi.newpipe.playqueue.events.MoveEvent; | ||||||
| import org.schabi.newpipe.playlist.events.PlayQueueEvent; | import org.schabi.newpipe.playqueue.events.PlayQueueEvent; | ||||||
| import org.schabi.newpipe.playlist.events.RemoveEvent; | import org.schabi.newpipe.playqueue.events.RemoveEvent; | ||||||
| import org.schabi.newpipe.playlist.events.ReorderEvent; | import org.schabi.newpipe.playqueue.events.ReorderEvent; | ||||||
| import org.schabi.newpipe.util.ServiceHelper; | import org.schabi.newpipe.util.ServiceHelper; | ||||||
|  |  | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| @@ -45,7 +45,7 @@ import io.reactivex.subjects.PublishSubject; | |||||||
|  |  | ||||||
| import static org.schabi.newpipe.player.mediasource.FailedMediaSource.MediaSourceResolutionException; | import static org.schabi.newpipe.player.mediasource.FailedMediaSource.MediaSourceResolutionException; | ||||||
| import static org.schabi.newpipe.player.mediasource.FailedMediaSource.StreamInfoLoadException; | import static org.schabi.newpipe.player.mediasource.FailedMediaSource.StreamInfoLoadException; | ||||||
| import static org.schabi.newpipe.playlist.PlayQueue.DEBUG; | import static org.schabi.newpipe.playqueue.PlayQueue.DEBUG; | ||||||
|  |  | ||||||
| public class MediaSourceManager { | public class MediaSourceManager { | ||||||
|     @NonNull private final String TAG = "MediaSourceManager@" + hashCode(); |     @NonNull private final String TAG = "MediaSourceManager@" + hashCode(); | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ import android.support.annotation.Nullable; | |||||||
| import com.google.android.exoplayer2.source.MediaSource; | import com.google.android.exoplayer2.source.MediaSource; | ||||||
|  |  | ||||||
| import org.schabi.newpipe.extractor.stream.StreamInfo; | import org.schabi.newpipe.extractor.stream.StreamInfo; | ||||||
| import org.schabi.newpipe.playlist.PlayQueueItem; | import org.schabi.newpipe.playqueue.PlayQueueItem; | ||||||
|  |  | ||||||
| import java.util.List; | import java.util.List; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist; | package org.schabi.newpipe.playqueue; | ||||||
| 
 | 
 | ||||||
| import android.util.Log; | import android.util.Log; | ||||||
| 
 | 
 | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist; | package org.schabi.newpipe.playqueue; | ||||||
| 
 | 
 | ||||||
| import org.schabi.newpipe.extractor.InfoItem; | import org.schabi.newpipe.extractor.InfoItem; | ||||||
| import org.schabi.newpipe.extractor.channel.ChannelInfo; | import org.schabi.newpipe.extractor.channel.ChannelInfo; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist; | package org.schabi.newpipe.playqueue; | ||||||
| 
 | 
 | ||||||
| import android.support.annotation.NonNull; | import android.support.annotation.NonNull; | ||||||
| import android.support.annotation.Nullable; | import android.support.annotation.Nullable; | ||||||
| @@ -6,15 +6,15 @@ import android.util.Log; | |||||||
| 
 | 
 | ||||||
| import org.reactivestreams.Subscriber; | import org.reactivestreams.Subscriber; | ||||||
| import org.reactivestreams.Subscription; | import org.reactivestreams.Subscription; | ||||||
| import org.schabi.newpipe.playlist.events.AppendEvent; | import org.schabi.newpipe.playqueue.events.AppendEvent; | ||||||
| import org.schabi.newpipe.playlist.events.ErrorEvent; | import org.schabi.newpipe.playqueue.events.ErrorEvent; | ||||||
| import org.schabi.newpipe.playlist.events.InitEvent; | import org.schabi.newpipe.playqueue.events.InitEvent; | ||||||
| import org.schabi.newpipe.playlist.events.MoveEvent; | import org.schabi.newpipe.playqueue.events.MoveEvent; | ||||||
| import org.schabi.newpipe.playlist.events.PlayQueueEvent; | import org.schabi.newpipe.playqueue.events.PlayQueueEvent; | ||||||
| import org.schabi.newpipe.playlist.events.RecoveryEvent; | import org.schabi.newpipe.playqueue.events.RecoveryEvent; | ||||||
| import org.schabi.newpipe.playlist.events.RemoveEvent; | import org.schabi.newpipe.playqueue.events.RemoveEvent; | ||||||
| import org.schabi.newpipe.playlist.events.ReorderEvent; | import org.schabi.newpipe.playqueue.events.ReorderEvent; | ||||||
| import org.schabi.newpipe.playlist.events.SelectEvent; | import org.schabi.newpipe.playqueue.events.SelectEvent; | ||||||
| 
 | 
 | ||||||
| import java.io.Serializable; | import java.io.Serializable; | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist; | package org.schabi.newpipe.playqueue; | ||||||
| 
 | 
 | ||||||
| import android.content.Context; | import android.content.Context; | ||||||
| import android.support.v7.widget.RecyclerView; | import android.support.v7.widget.RecyclerView; | ||||||
| @@ -8,12 +8,12 @@ import android.view.View; | |||||||
| import android.view.ViewGroup; | import android.view.ViewGroup; | ||||||
| 
 | 
 | ||||||
| import org.schabi.newpipe.R; | import org.schabi.newpipe.R; | ||||||
| import org.schabi.newpipe.playlist.events.AppendEvent; | import org.schabi.newpipe.playqueue.events.AppendEvent; | ||||||
| import org.schabi.newpipe.playlist.events.ErrorEvent; | import org.schabi.newpipe.playqueue.events.ErrorEvent; | ||||||
| import org.schabi.newpipe.playlist.events.MoveEvent; | import org.schabi.newpipe.playqueue.events.MoveEvent; | ||||||
| import org.schabi.newpipe.playlist.events.PlayQueueEvent; | import org.schabi.newpipe.playqueue.events.PlayQueueEvent; | ||||||
| import org.schabi.newpipe.playlist.events.RemoveEvent; | import org.schabi.newpipe.playqueue.events.RemoveEvent; | ||||||
| import org.schabi.newpipe.playlist.events.SelectEvent; | import org.schabi.newpipe.playqueue.events.SelectEvent; | ||||||
| 
 | 
 | ||||||
| import java.util.List; | import java.util.List; | ||||||
| 
 | 
 | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist; | package org.schabi.newpipe.playqueue; | ||||||
| 
 | 
 | ||||||
| import android.support.annotation.NonNull; | import android.support.annotation.NonNull; | ||||||
| import android.support.annotation.Nullable; | import android.support.annotation.Nullable; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist; | package org.schabi.newpipe.playqueue; | ||||||
| 
 | 
 | ||||||
| import android.content.Context; | import android.content.Context; | ||||||
| import android.text.TextUtils; | import android.text.TextUtils; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist; | package org.schabi.newpipe.playqueue; | ||||||
| 
 | 
 | ||||||
| import android.support.v7.widget.RecyclerView; | import android.support.v7.widget.RecyclerView; | ||||||
| import android.view.View; | import android.view.View; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist; | package org.schabi.newpipe.playqueue; | ||||||
| 
 | 
 | ||||||
| import android.support.v7.widget.RecyclerView; | import android.support.v7.widget.RecyclerView; | ||||||
| import android.support.v7.widget.helper.ItemTouchHelper; | import android.support.v7.widget.helper.ItemTouchHelper; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist; | package org.schabi.newpipe.playqueue; | ||||||
| 
 | 
 | ||||||
| import org.schabi.newpipe.extractor.InfoItem; | import org.schabi.newpipe.extractor.InfoItem; | ||||||
| import org.schabi.newpipe.extractor.playlist.PlaylistInfo; | import org.schabi.newpipe.extractor.playlist.PlaylistInfo; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist; | package org.schabi.newpipe.playqueue; | ||||||
| 
 | 
 | ||||||
| import org.schabi.newpipe.extractor.stream.StreamInfo; | import org.schabi.newpipe.extractor.stream.StreamInfo; | ||||||
| import org.schabi.newpipe.extractor.stream.StreamInfoItem; | import org.schabi.newpipe.extractor.stream.StreamInfoItem; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist; | package org.schabi.newpipe.playqueue; | ||||||
| 
 | 
 | ||||||
| import android.app.Activity; | import android.app.Activity; | ||||||
| import android.content.Context; | import android.content.Context; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist.events; | package org.schabi.newpipe.playqueue.events; | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| public class AppendEvent implements PlayQueueEvent { | public class AppendEvent implements PlayQueueEvent { | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist.events; | package org.schabi.newpipe.playqueue.events; | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| public class ErrorEvent implements PlayQueueEvent { | public class ErrorEvent implements PlayQueueEvent { | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist.events; | package org.schabi.newpipe.playqueue.events; | ||||||
| 
 | 
 | ||||||
| public class InitEvent implements PlayQueueEvent { | public class InitEvent implements PlayQueueEvent { | ||||||
|     @Override |     @Override | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist.events; | package org.schabi.newpipe.playqueue.events; | ||||||
| 
 | 
 | ||||||
| public class MoveEvent implements PlayQueueEvent { | public class MoveEvent implements PlayQueueEvent { | ||||||
|     final private int fromIndex; |     final private int fromIndex; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist.events; | package org.schabi.newpipe.playqueue.events; | ||||||
| 
 | 
 | ||||||
| import java.io.Serializable; | import java.io.Serializable; | ||||||
| 
 | 
 | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist.events; | package org.schabi.newpipe.playqueue.events; | ||||||
| 
 | 
 | ||||||
| public enum PlayQueueEventType { | public enum PlayQueueEventType { | ||||||
|     INIT, |     INIT, | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist.events; | package org.schabi.newpipe.playqueue.events; | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| public class RecoveryEvent implements PlayQueueEvent { | public class RecoveryEvent implements PlayQueueEvent { | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist.events; | package org.schabi.newpipe.playqueue.events; | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| public class RemoveEvent implements PlayQueueEvent { | public class RemoveEvent implements PlayQueueEvent { | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist.events; | package org.schabi.newpipe.playqueue.events; | ||||||
| 
 | 
 | ||||||
| public class ReorderEvent implements PlayQueueEvent { | public class ReorderEvent implements PlayQueueEvent { | ||||||
|     private final int fromSelectedIndex; |     private final int fromSelectedIndex; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package org.schabi.newpipe.playlist.events; | package org.schabi.newpipe.playqueue.events; | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| public class SelectEvent implements PlayQueueEvent { | public class SelectEvent implements PlayQueueEvent { | ||||||
| @@ -49,7 +49,7 @@ import org.schabi.newpipe.player.PopupVideoPlayer; | |||||||
| import org.schabi.newpipe.player.PopupVideoPlayerActivity; | import org.schabi.newpipe.player.PopupVideoPlayerActivity; | ||||||
| import org.schabi.newpipe.player.VideoPlayer; | import org.schabi.newpipe.player.VideoPlayer; | ||||||
| import org.schabi.newpipe.player.old.PlayVideoActivity; | import org.schabi.newpipe.player.old.PlayVideoActivity; | ||||||
| import org.schabi.newpipe.playlist.PlayQueue; | import org.schabi.newpipe.playqueue.PlayQueue; | ||||||
| import org.schabi.newpipe.settings.SettingsActivity; | import org.schabi.newpipe.settings.SettingsActivity; | ||||||
|  |  | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Christian Schabesberger
					Christian Schabesberger