summaryrefslogtreecommitdiff
path: root/model/src
diff options
context:
space:
mode:
Diffstat (limited to 'model/src')
-rw-r--r--model/src/main/AndroidManifest.xml1
-rw-r--r--model/src/main/java/de/danoeh/antennapod/model/feed/SortOrder.java2
-rw-r--r--model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java5
3 files changed, 6 insertions, 2 deletions
diff --git a/model/src/main/AndroidManifest.xml b/model/src/main/AndroidManifest.xml
deleted file mode 100644
index 968649054..000000000
--- a/model/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.model" />
diff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/SortOrder.java b/model/src/main/java/de/danoeh/antennapod/model/feed/SortOrder.java
index 1f9687b2e..08504b445 100644
--- a/model/src/main/java/de/danoeh/antennapod/model/feed/SortOrder.java
+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/SortOrder.java
@@ -20,6 +20,8 @@ public enum SortOrder {
DURATION_LONG_SHORT(6, INTRA_FEED),
EPISODE_FILENAME_A_Z(7, INTRA_FEED),
EPISODE_FILENAME_Z_A(8, INTRA_FEED),
+ SIZE_SMALL_LARGE(9, INTRA_FEED),
+ SIZE_LARGE_SMALL(10, INTRA_FEED),
FEED_TITLE_A_Z(101, INTER_FEED),
FEED_TITLE_Z_A(102, INTER_FEED),
RANDOM(103, INTER_FEED),
diff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java b/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java
index 67e30e5c8..e71c5ad36 100644
--- a/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java
+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/VolumeAdaptionSetting.java
@@ -3,7 +3,10 @@ package de.danoeh.antennapod.model.feed;
public enum VolumeAdaptionSetting {
OFF(0, 1.0f),
LIGHT_REDUCTION(1, 0.5f),
- HEAVY_REDUCTION(2, 0.2f);
+ HEAVY_REDUCTION(2, 0.2f),
+ LIGHT_BOOST(3, 1.5f),
+ MEDIUM_BOOST(4, 2f),
+ HEAVY_BOOST(5, 2.5f);
private final int value;
private float adaptionFactor;