26 files changed, 35 insertions, 50 deletions

diff --git a/firmware/export/config/agptekrocker.h b/firmware/export/config/agptekrocker.h
index 46c9e43b7c..31ef904109 100644
--- a/firmware/export/config/agptekrocker.h
+++ b/firmware/export/config/agptekrocker.h
@@ -124,8 +124,7 @@
 #define HAVE_SW_TONE_CONTROLS
 
 /* HW codec is flexible */
-#define HW_SAMPR_CAPS SAMPR_CAP_ALL
-#define HAVE_PLAY_FREQ
+#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192
 
 /* Battery */
 #define BATTERY_CAPACITY_DEFAULT 600 /* default battery capacity */
diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h
index 2592325160..bd1dd6c2b1 100644
--- a/firmware/export/config/creativezen.h
+++ b/firmware/export/config/creativezen.h
@@ -11,12 +11,12 @@
 /* Define if boot data from bootloader has been enabled for the target */
 #define HAVE_BOOTDATA
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_48
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
 
-#define REC_SAMPR_CAPS      SAMPR_CAP_ALL
+#define REC_SAMPR_CAPS      SAMPR_CAP_ALL_48
 
 /* Default recording levels */
 #define DEFAULT_REC_MIC_GAIN    23
diff --git a/firmware/export/config/creativezenmozaic.h b/firmware/export/config/creativezenmozaic.h
index 0ffe8ed45b..9272a7b412 100644
--- a/firmware/export/config/creativezenmozaic.h
+++ b/firmware/export/config/creativezenmozaic.h
@@ -9,12 +9,12 @@
 #define MODEL_NUMBER 87
 #define MODEL_NAME   "Creative ZEN Mozaic"
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_48
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
 
-#define REC_SAMPR_CAPS      SAMPR_CAP_ALL
+#define REC_SAMPR_CAPS      SAMPR_CAP_ALL_48
 
 /* Default recording levels */
 #define DEFAULT_REC_MIC_GAIN    23
diff --git a/firmware/export/config/creativezenv.h b/firmware/export/config/creativezenv.h
index 288c2aecbd..5caf7c8c2b 100644
--- a/firmware/export/config/creativezenv.h
+++ b/firmware/export/config/creativezenv.h
@@ -9,12 +9,12 @@
 #define MODEL_NUMBER 92
 #define MODEL_NAME   "Creative ZEN V"
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_48
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
 
-#define REC_SAMPR_CAPS      SAMPR_CAP_ALL
+#define REC_SAMPR_CAPS      SAMPR_CAP_ALL_48
 
 /* Default recording levels */
 #define DEFAULT_REC_MIC_GAIN    23
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h
index 977e11feff..604cf2c3cd 100644
--- a/firmware/export/config/creativezenxfi.h
+++ b/firmware/export/config/creativezenxfi.h
@@ -9,12 +9,12 @@
 #define MODEL_NUMBER 86
 #define MODEL_NAME   "Creative Zen X-Fi"
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_48
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
 
-#define REC_SAMPR_CAPS      SAMPR_CAP_ALL
+#define REC_SAMPR_CAPS      SAMPR_CAP_ALL_48
 
 /* Default recording levels */
 #define DEFAULT_REC_MIC_GAIN    23
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h
index 3a14017bf2..171f5fb2b0 100644
--- a/firmware/export/config/creativezenxfi2.h
+++ b/firmware/export/config/creativezenxfi2.h
@@ -11,12 +11,12 @@
 /* Define if boot data from bootloader has been enabled for the target */
 #define HAVE_BOOTDATA
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_48
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
 
-#define REC_SAMPR_CAPS      SAMPR_CAP_ALL
+#define REC_SAMPR_CAPS      SAMPR_CAP_ALL_48
 
 /* Default recording levels */
 #define DEFAULT_REC_MIC_GAIN    23
diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h
index 5139de0588..5f0914b9e4 100644
--- a/firmware/export/config/creativezenxfi3.h
+++ b/firmware/export/config/creativezenxfi3.h
@@ -11,12 +11,12 @@
 /* Define if boot data from bootloader has been enabled for the target */
 #define HAVE_BOOTDATA
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_48
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
 
-#define REC_SAMPR_CAPS      SAMPR_CAP_ALL
+#define REC_SAMPR_CAPS      SAMPR_CAP_ALL_48
 
 /* Default recording levels */
 #define DEFAULT_REC_MIC_GAIN    23
diff --git a/firmware/export/config/creativezenxfistyle.h b/firmware/export/config/creativezenxfistyle.h
index 41f5ce97b8..33f459dba9 100644
--- a/firmware/export/config/creativezenxfistyle.h
+++ b/firmware/export/config/creativezenxfistyle.h
@@ -9,12 +9,12 @@
 #define MODEL_NUMBER 94
 #define MODEL_NAME   "Creative Zen X-Fi Style"
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_48
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
 
-#define REC_SAMPR_CAPS      SAMPR_CAP_ALL
+#define REC_SAMPR_CAPS      SAMPR_CAP_ALL_48
 
 /* Default recording levels */
 #define DEFAULT_REC_MIC_GAIN    23
diff --git a/firmware/export/config/ibassodx50.h b/firmware/export/config/ibassodx50.h
index 9f5e343978..05e8aa9213 100644
--- a/firmware/export/config/ibassodx50.h
+++ b/firmware/export/config/ibassodx50.h
@@ -99,8 +99,7 @@
 
 #define HAVE_SW_TONE_CONTROLS
 #define HAVE_SW_VOLUME_CONTROL
-#define HW_SAMPR_CAPS SAMPR_CAP_ALL
-#define HAVE_PLAY_FREQ
+#define HW_SAMPR_CAPS SAMPR_CAP_ALL_96
 
 //#define HAVE_MULTIMEDIA_KEYS
 #define CONFIG_KEYPAD DX50_PAD
diff --git a/firmware/export/config/ibassodx90.h b/firmware/export/config/ibassodx90.h
index 8155cec5aa..1e2a1be062 100644
--- a/firmware/export/config/ibassodx90.h
+++ b/firmware/export/config/ibassodx90.h
@@ -98,8 +98,7 @@
 
 #define HAVE_SW_TONE_CONTROLS
 #define HAVE_SW_VOLUME_CONTROL
-#define HW_SAMPR_CAPS SAMPR_CAP_ALL
-#define HAVE_PLAY_FREQ
+#define HW_SAMPR_CAPS SAMPR_CAP_ALL_96
 
 //#define HAVE_MULTIMEDIA_KEYS
 #define CONFIG_KEYPAD DX50_PAD
diff --git a/firmware/export/config/samsungypz5.h b/firmware/export/config/samsungypz5.h
index c890d629f1..2af62c1cbe 100644
--- a/firmware/export/config/samsungypz5.h
+++ b/firmware/export/config/samsungypz5.h
@@ -11,12 +11,12 @@
 /* Define if boot data from bootloader has been enabled for the target */
 #define HAVE_BOOTDATA
 
-#define HW_SAMPR_CAPS           SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS           SAMPR_CAP_ALL_48
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
 
-#define REC_SAMPR_CAPS          SAMPR_CAP_ALL
+#define REC_SAMPR_CAPS          SAMPR_CAP_ALL_48
 
 /* Default recording levels */
 #define DEFAULT_REC_MIC_GAIN    23
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h
index 66e02f9738..df306e88b0 100644
--- a/firmware/export/config/sansac200v2.h
+++ b/firmware/export/config/sansac200v2.h
@@ -8,7 +8,7 @@
 #define FIRMWARE_OFFSET_FILE_DATA 8
 #define FIRMWARE_OFFSET_FILE_CRC 0
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h
index 84970e820d..faab50590c 100644
--- a/firmware/export/config/sansaclip.h
+++ b/firmware/export/config/sansaclip.h
@@ -8,7 +8,7 @@
 #define FIRMWARE_OFFSET_FILE_DATA 8
 #define FIRMWARE_OFFSET_FILE_CRC 0
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index d4638a1acd..3108bace61 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -19,7 +19,7 @@
 #define HAVE_HOTSWAP
 #endif
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h
index df5e15d369..6e369db681 100644
--- a/firmware/export/config/sansaclipv2.h
+++ b/firmware/export/config/sansaclipv2.h
@@ -10,7 +10,7 @@
 /* Define if boot data from bootloader has been enabled for the target */
 #define HAVE_BOOTDATA
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h
index 01ba0e1346..6afe6e129e 100644
--- a/firmware/export/config/sansaclipzip.h
+++ b/firmware/export/config/sansaclipzip.h
@@ -20,7 +20,7 @@
 #define HAVE_RDS_CAP
 #endif
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h
index 211fee701b..27dd881e73 100644
--- a/firmware/export/config/sansae200v2.h
+++ b/firmware/export/config/sansae200v2.h
@@ -6,7 +6,7 @@
 #define MODEL_NUMBER 41
 #define MODEL_NAME   "Sandisk Sansa e200v2 series"
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h
index fb17923e90..b72f5b5198 100644
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config/sansafuze.h
@@ -11,7 +11,7 @@
 /* define boot redirect file name allows booting from external drives */
 #define BOOT_REDIR "rockbox_main.fuze"
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h
index 0306b4d14a..aeb9153fcc 100644
--- a/firmware/export/config/sansafuzeplus.h
+++ b/firmware/export/config/sansafuzeplus.h
@@ -13,12 +13,12 @@
 /* define boot redirect file name allows booting from external drives */
 #define BOOT_REDIR "rockbox_main.fuze+"
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_48
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
 
-#define REC_SAMPR_CAPS      SAMPR_CAP_ALL
+#define REC_SAMPR_CAPS      SAMPR_CAP_ALL_48
 
 /* Default recording levels */
 #define DEFAULT_REC_MIC_GAIN    23
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h
index 6c42e58f7a..fc2ff68257 100644
--- a/firmware/export/config/sansafuzev2.h
+++ b/firmware/export/config/sansafuzev2.h
@@ -11,7 +11,7 @@
 /* define boot redirect file name allows booting from external drives */
 #define BOOT_REDIR "rockbox_main.fuze2"
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h
index b6ebaf4266..97462dc6e2 100644
--- a/firmware/export/config/sansam200v4.h
+++ b/firmware/export/config/sansam200v4.h
@@ -10,7 +10,7 @@
 /* Enable FAT16 support */
 #define HAVE_FAT16SUPPORT
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
diff --git a/firmware/export/config/sonynwze360.h b/firmware/export/config/sonynwze360.h
index 7240070ba4..5b33d9d6d1 100644
--- a/firmware/export/config/sonynwze360.h
+++ b/firmware/export/config/sonynwze360.h
@@ -11,7 +11,7 @@
 /* Define if boot data from bootloader has been enabled for the target */
 #define HAVE_BOOTDATA
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
 /* Define bitmask of input sources - recordable bitmask can be defined
    explicitly if different */
diff --git a/firmware/export/config/sonynwze370.h b/firmware/export/config/sonynwze370.h
index 08c5c4a99f..b20ab00550 100644
--- a/firmware/export/config/sonynwze370.h
+++ b/firmware/export/config/sonynwze370.h
@@ -11,7 +11,7 @@
 /* Define if boot data from bootloader has been enabled for the target */
 #define HAVE_BOOTDATA
 
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
+#define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
 /* Define bitmask of input sources - recordable bitmask can be defined
    explicitly if different */
diff --git a/firmware/export/config/xduoox20.h b/firmware/export/config/xduoox20.h
index 3cfa763f72..a61f2c3aa7 100644
--- a/firmware/export/config/xduoox20.h
+++ b/firmware/export/config/xduoox20.h
@@ -123,8 +123,7 @@
 #define HAVE_SW_TONE_CONTROLS
 
 /* HW codec is flexible */
-#define HW_SAMPR_CAPS SAMPR_CAP_ALL
-#define HAVE_PLAY_FREQ
+#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192
 
 /* Battery */
 #define BATTERY_CAPACITY_DEFAULT 2400 /* default battery capacity */
diff --git a/firmware/export/config/xduoox3.h b/firmware/export/config/xduoox3.h
index 7de8fa1510..4c2cc47fc9 100644
--- a/firmware/export/config/xduoox3.h
+++ b/firmware/export/config/xduoox3.h
@@ -17,9 +17,6 @@
 /* ChinaChip NAND FTL */
 #define CONFIG_NAND NAND_CC
 
-
-
-
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
@@ -112,8 +109,7 @@
 #define HAVE_SW_TONE_CONTROLS
 
 /* define the bitmask of hardware sample rates */
-#define HW_SAMPR_CAPS       SAMPR_CAP_ALL
-#define HAVE_PLAY_FREQ
+#define HW_SAMPR_CAPS  SAMPR_CAP_ALL_96
 
 #define AB_REPEAT_ENABLE
 
diff --git a/firmware/export/config/xduoox3ii.h b/firmware/export/config/xduoox3ii.h
index 42fb926697..13072ea3dc 100644
--- a/firmware/export/config/xduoox3ii.h
+++ b/firmware/export/config/xduoox3ii.h
@@ -17,9 +17,6 @@
 #define CONFIG_PLATFORM (PLATFORM_HOSTED)
 #endif
 
-
-
-
 /* define this if you have a colour LCD */
 #define HAVE_LCD_COLOR
 
@@ -72,9 +69,6 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x100000
 
-
-
-
 #define HAVE_HEADPHONE_DETECTION
 
 /* KeyPad configuration for plugins */
@@ -123,8 +117,7 @@
 #define HAVE_SW_TONE_CONTROLS
 
 /* HW codec is flexible */
-#define HW_SAMPR_CAPS SAMPR_CAP_ALL
-#define HAVE_PLAY_FREQ
+#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192
 
 /* Battery */
 #define BATTERY_CAPACITY_DEFAULT 2000 /* default battery capacity */