diff options
Diffstat (limited to 'src/de/danoeh/antennapod')
14 files changed, 20 insertions, 18 deletions
diff --git a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java index 469acc9fb..c6fa5c79f 100644 --- a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java @@ -26,7 +26,7 @@ import de.danoeh.antennapod.feed.SimpleChapter; import de.danoeh.antennapod.fragment.CoverFragment; import de.danoeh.antennapod.fragment.ItemDescriptionFragment; import de.danoeh.antennapod.service.PlaybackService; -import de.danoeh.antennapod.util.Playable; +import de.danoeh.antennapod.util.playback.Playable; /** Activity for playing audio files. */ public class AudioplayerActivity extends MediaplayerActivity { diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java index 09d3c5a3f..89a38466b 100644 --- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -26,11 +26,11 @@ import de.danoeh.antennapod.feed.FeedManager; import de.danoeh.antennapod.preferences.UserPreferences; import de.danoeh.antennapod.service.PlaybackService; import de.danoeh.antennapod.util.Converter; -import de.danoeh.antennapod.util.MediaPlayerError; -import de.danoeh.antennapod.util.Playable; -import de.danoeh.antennapod.util.PlaybackController; import de.danoeh.antennapod.util.ShareUtils; import de.danoeh.antennapod.util.StorageUtils; +import de.danoeh.antennapod.util.playback.MediaPlayerError; +import de.danoeh.antennapod.util.playback.Playable; +import de.danoeh.antennapod.util.playback.PlaybackController; /** * Provides general features which are both needed for playing audio and video diff --git a/src/de/danoeh/antennapod/activity/VideoplayerActivity.java b/src/de/danoeh/antennapod/activity/VideoplayerActivity.java index 004ab85ab..a663d1012 100644 --- a/src/de/danoeh/antennapod/activity/VideoplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/VideoplayerActivity.java @@ -22,7 +22,7 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.preferences.UserPreferences; import de.danoeh.antennapod.service.PlaybackService; import de.danoeh.antennapod.service.PlayerStatus; -import de.danoeh.antennapod.util.Playable; +import de.danoeh.antennapod.util.playback.Playable; /** Activity for playing audio files. */ public class VideoplayerActivity extends MediaplayerActivity implements diff --git a/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java b/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java index e60b28189..3e9b586ce 100644 --- a/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java +++ b/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java @@ -22,7 +22,7 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.feed.Chapter; import de.danoeh.antennapod.util.ChapterUtils; import de.danoeh.antennapod.util.Converter; -import de.danoeh.antennapod.util.Playable; +import de.danoeh.antennapod.util.playback.Playable; public class ChapterListAdapter extends ArrayAdapter<Chapter> { diff --git a/src/de/danoeh/antennapod/feed/FeedMedia.java b/src/de/danoeh/antennapod/feed/FeedMedia.java index 5d139f01a..40b220fd9 100644 --- a/src/de/danoeh/antennapod/feed/FeedMedia.java +++ b/src/de/danoeh/antennapod/feed/FeedMedia.java @@ -9,7 +9,7 @@ import android.os.Parcel; import android.os.Parcelable; import de.danoeh.antennapod.PodcastApp; import de.danoeh.antennapod.util.ChapterUtils; -import de.danoeh.antennapod.util.Playable; +import de.danoeh.antennapod.util.playback.Playable; public class FeedMedia extends FeedFile implements Playable { diff --git a/src/de/danoeh/antennapod/fragment/CoverFragment.java b/src/de/danoeh/antennapod/fragment/CoverFragment.java index 29a160960..c477ea2b8 100644 --- a/src/de/danoeh/antennapod/fragment/CoverFragment.java +++ b/src/de/danoeh/antennapod/fragment/CoverFragment.java @@ -13,7 +13,7 @@ import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.AudioplayerActivity.AudioplayerContentFragment; import de.danoeh.antennapod.asynctask.ImageLoader; -import de.danoeh.antennapod.util.Playable; +import de.danoeh.antennapod.util.playback.Playable; /** Displays the cover and the title of a FeedItem. */ public class CoverFragment extends SherlockFragment implements diff --git a/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java index bc4f7bdec..94aa2b0fc 100644 --- a/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java +++ b/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java @@ -17,8 +17,8 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.asynctask.ImageLoader; import de.danoeh.antennapod.service.PlaybackService; import de.danoeh.antennapod.util.Converter; -import de.danoeh.antennapod.util.Playable; -import de.danoeh.antennapod.util.PlaybackController; +import de.danoeh.antennapod.util.playback.Playable; +import de.danoeh.antennapod.util.playback.PlaybackController; /** * Fragment which is supposed to be displayed outside of the MediaplayerActivity diff --git a/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java index 5b1edd777..5fd563509 100644 --- a/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java +++ b/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java @@ -33,8 +33,8 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.feed.FeedItem; import de.danoeh.antennapod.feed.FeedManager; import de.danoeh.antennapod.preferences.UserPreferences; -import de.danoeh.antennapod.util.Playable; import de.danoeh.antennapod.util.ShareUtils; +import de.danoeh.antennapod.util.playback.Playable; /** Displays the description of a Playable object in a Webview. */ public class ItemDescriptionFragment extends SherlockFragment { diff --git a/src/de/danoeh/antennapod/service/PlaybackService.java b/src/de/danoeh/antennapod/service/PlaybackService.java index 7068a35d2..7e2158297 100644 --- a/src/de/danoeh/antennapod/service/PlaybackService.java +++ b/src/de/danoeh/antennapod/service/PlaybackService.java @@ -52,9 +52,9 @@ import de.danoeh.antennapod.preferences.UserPreferences; import de.danoeh.antennapod.receiver.MediaButtonReceiver; import de.danoeh.antennapod.receiver.PlayerWidget; import de.danoeh.antennapod.util.BitmapDecoder; -import de.danoeh.antennapod.util.Playable; -import de.danoeh.antennapod.util.Playable.PlayableException; import de.danoeh.antennapod.util.flattr.FlattrUtils; +import de.danoeh.antennapod.util.playback.Playable; +import de.danoeh.antennapod.util.playback.Playable.PlayableException; /** Controls the MediaPlayer that plays a FeedMedia-file */ public class PlaybackService extends Service { diff --git a/src/de/danoeh/antennapod/service/PlayerWidgetService.java b/src/de/danoeh/antennapod/service/PlayerWidgetService.java index 1a33806ba..61bfb4887 100644 --- a/src/de/danoeh/antennapod/service/PlayerWidgetService.java +++ b/src/de/danoeh/antennapod/service/PlayerWidgetService.java @@ -16,7 +16,7 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.receiver.MediaButtonReceiver; import de.danoeh.antennapod.receiver.PlayerWidget; import de.danoeh.antennapod.util.Converter; -import de.danoeh.antennapod.util.Playable; +import de.danoeh.antennapod.util.playback.Playable; /** Updates the state of the player widget */ public class PlayerWidgetService extends Service { diff --git a/src/de/danoeh/antennapod/util/ChapterUtils.java b/src/de/danoeh/antennapod/util/ChapterUtils.java index 5590707dc..1c2210481 100644 --- a/src/de/danoeh/antennapod/util/ChapterUtils.java +++ b/src/de/danoeh/antennapod/util/ChapterUtils.java @@ -19,6 +19,7 @@ import de.danoeh.antennapod.feed.Chapter; import de.danoeh.antennapod.util.comparator.ChapterStartTimeComparator; import de.danoeh.antennapod.util.id3reader.ChapterReader; import de.danoeh.antennapod.util.id3reader.ID3ReaderException; +import de.danoeh.antennapod.util.playback.Playable; import de.danoeh.antennapod.util.vorbiscommentreader.VorbisCommentChapterReader; import de.danoeh.antennapod.util.vorbiscommentreader.VorbisCommentReaderException; diff --git a/src/de/danoeh/antennapod/util/MediaPlayerError.java b/src/de/danoeh/antennapod/util/playback/MediaPlayerError.java index 93922c747..23ead581f 100644 --- a/src/de/danoeh/antennapod/util/MediaPlayerError.java +++ b/src/de/danoeh/antennapod/util/playback/MediaPlayerError.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.util; +package de.danoeh.antennapod.util.playback; import android.content.Context; import android.media.MediaPlayer; diff --git a/src/de/danoeh/antennapod/util/Playable.java b/src/de/danoeh/antennapod/util/playback/Playable.java index 360a31ac1..67acbb692 100644 --- a/src/de/danoeh/antennapod/util/Playable.java +++ b/src/de/danoeh/antennapod/util/playback/Playable.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.util; +package de.danoeh.antennapod.util.playback; import java.util.List; diff --git a/src/de/danoeh/antennapod/util/PlaybackController.java b/src/de/danoeh/antennapod/util/playback/PlaybackController.java index cad5af92e..699ff6699 100644 --- a/src/de/danoeh/antennapod/util/PlaybackController.java +++ b/src/de/danoeh/antennapod/util/playback/PlaybackController.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.util; +package de.danoeh.antennapod.util.playback; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ScheduledFuture; @@ -33,7 +33,8 @@ import de.danoeh.antennapod.feed.FeedMedia; import de.danoeh.antennapod.preferences.PlaybackPreferences; import de.danoeh.antennapod.service.PlaybackService; import de.danoeh.antennapod.service.PlayerStatus; -import de.danoeh.antennapod.util.Playable.PlayableUtils; +import de.danoeh.antennapod.util.Converter; +import de.danoeh.antennapod.util.playback.Playable.PlayableUtils; /** * Communicates with the playback service. GUI classes should use this class to |