104 files changed, 205 insertions, 360 deletions

diff --git a/firmware/export/audio.h b/firmware/export/audio.h
index 5ed9c706a4..c2c23dfd5c 100644
--- a/firmware/export/audio.h
+++ b/firmware/export/audio.h
@@ -18,8 +18,8 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#ifndef AUDIO_H
-#define AUDIO_H
+#ifndef __AUDIO_H
+#define __AUDIO_H
 
 #include <stdbool.h>
 #include <string.h> /* size_t */
@@ -27,13 +27,11 @@
 /* These must always be included with audio.h for this to compile under
    cetain conditions. Do it here or else spread the complication around to
    many files. */
-#if CONFIG_CODEC == SWCODEC
 #include "pcm_sampr.h"
 #include "pcm.h"
 #ifdef HAVE_RECORDING
 #include "enc_base.h"
 #endif /* HAVE_RECORDING */
-#endif /* CONFIG_CODEC == SWCODEC */
 
 #define AUDIO_STATUS_PLAY       0x0001
 #define AUDIO_STATUS_PAUSE      0x0002
@@ -75,44 +73,9 @@ void audio_error_clear(void);
 int audio_get_file_pos(void);
 void audio_beep(int duration);
 
-#if CONFIG_CODEC == SWCODEC
 void audio_next_dir(void);
 void audio_prev_dir(void);
 
-#else /* hwcodec only */
-struct audio_debug
-{
-        int audiobuflen;
-        int audiobuf_write;
-        int audiobuf_swapwrite;
-        int audiobuf_read;
-
-        int last_dma_chunk_size;
-
-        bool dma_on;
-        bool playing;
-        bool play_pending;
-        bool is_playing;
-        bool filling;
-        bool dma_underrun;
-
-        int unplayed_space;
-        int playable_space;
-        int unswapped_space;
-
-        int low_watermark_level;
-        int lowest_watermark_level;
-};
-
-void audio_get_debugdata(struct audio_debug *dbgdata);
-/* unsigned int audio_error(void); - unused function */
-void audio_init_playback(void);
-
-#define audio_next_dir() ({ })
-#define audio_prev_dir() ({ })
-
-#endif
-
 /* channel modes */
 enum rec_channel_modes
 {
@@ -124,12 +87,10 @@ enum rec_channel_modes
     CHN_NUM_MODES
 };
 
-#if CONFIG_CODEC == SWCODEC
 /* channel mode capability bits */
 #define CHN_CAP_STEREO  (1 << CHN_MODE_STEREO)
 #define CHN_CAP_MONO    (1 << CHN_MODE_MONO)
 #define CHN_CAP_ALL     (CHN_CAP_STEREO | CHN_CAP_MONO)
-#endif /* CONFIG_CODEC == SWCODEC */
 
 /* the enums below must match prestr[] in recording.c */
 enum audio_sources
@@ -164,7 +125,6 @@ enum rec_sources
 };
 #endif /* HAVE_RECORDING */
 
-#if CONFIG_CODEC == SWCODEC
 /* selects a source to monitor for recording or playback */
 #define SRCF_PLAYBACK         0x0000    /* default */
 #define SRCF_RECORDING        0x1000
@@ -173,7 +133,6 @@ enum rec_sources
 #define SRCF_FMRADIO_PLAYING  0x0000    /* default */
 #define SRCF_FMRADIO_PAUSED   0x2000
 #endif
-#endif
 
 #ifdef HAVE_RECORDING
 /* parameters for audio_set_recording_options */
@@ -183,14 +142,9 @@ struct audio_recording_options
     int  rec_frequency;
     int  rec_channels;
     int  rec_prerecord_time;
-#if CONFIG_CODEC == SWCODEC
     int  rec_mono_mode;
     int  rec_source_flags;  /* for rec_set_source */
     struct encoder_config enc_config;
-#else
-    int  rec_quality;
-    bool rec_editable;
-#endif
 };
 
 /* audio recording functions */
@@ -206,15 +160,10 @@ void audio_set_recording_gain(int left, int right, int type);
 unsigned long audio_recorded_time(void);
 unsigned long audio_num_recorded_bytes(void);
 
-#if CONFIG_CODEC == SWCODEC
-/* SWCODEC recording functions */
 unsigned long audio_prerecorded_time(void);
-#endif /* CONFIG_CODEC == SWCODEC */
 
 #endif /* HAVE_RECORDING */
 
-#if CONFIG_CODEC == SWCODEC
-/* SWCODEC misc. audio functions */
 #if INPUT_SRC_CAPS != 0
 /* audio.c */
 void audio_set_input_source(int source, unsigned flags);
@@ -223,7 +172,6 @@ void audio_set_input_source(int source, unsigned flags);
 void audio_input_mux(int source, unsigned flags);
 void audio_set_output_source(int source);
 #endif /* INPUT_SRC_CAPS */
-#endif /* CONFIG_CODEC == SWCODEC */
 
 #ifdef HAVE_SPDIF_IN
 /* returns index into rec_master_sampr_list */
@@ -247,11 +195,9 @@ enum track_event_flags
 {
     TEF_NONE      = 0x0,  /* no flags are set */
     TEF_CURRENT   = 0x1,  /* event is for the current track */
-#if CONFIG_CODEC == SWCODEC
     TEF_AUTO_SKIP = 0x2,  /* event is sent in context of auto skip */
     TEF_REWIND    = 0x4,  /* interpret as rewind, id3->elapsed is the
                              position before the seek back to 0 */
-#endif /* CONFIG_CODEC == SWCODEC */
 };
 
 struct track_event
@@ -260,43 +206,4 @@ struct track_event
     struct mp3entry *id3; /* pointer to mp3entry describing track */
 };
 
-#if CONFIG_CODEC != SWCODEC
-/* subscribe to one or more audio event(s) by OR'ing together the desired */
-/* event IDs (defined below); a handler is called with a solitary event ID */
-/* (so switch() is okay) and possibly some useful data (depending on the */
-/* event); a handler must return one of the return codes defined below */
-
-typedef int (*AUDIO_EVENT_HANDLER)(unsigned short event, unsigned long data);
-
-void audio_register_event_handler(AUDIO_EVENT_HANDLER handler, unsigned short mask);
-
-/***********************************************************************/
-/* handler return codes */
-
-#define AUDIO_EVENT_RC_IGNORED      200
-    /* indicates that no action was taken or the event was not recognized */
-
-#define AUDIO_EVENT_RC_HANDLED      201
-    /* indicates that the event was handled and some action was taken which renders
-    the original event invalid; USE WITH CARE!; this return code aborts all further
-    processing of the given event */
-
-/***********************************************************************/
-/* audio event IDs */
-
-#define AUDIO_EVENT_POS_REPORT      (1<<0)
-    /* sends a periodic song position report to handlers; a report is sent on
-    each kernal tick; the number of ticks per second is defined by HZ; on each
-    report the current song position is passed in 'data'; if a handler takes an
-    action that changes the song or the song position it must return
-    AUDIO_EVENT_RC_HANDLED which suppresses the event for any remaining handlers */
-
-#define AUDIO_EVENT_END_OF_TRACK    (1<<1)
-    /* generated when the end of the currently playing track is reached; no
-    data is passed; if the handler implements some alternate end-of-track
-    processing it should return AUDIO_EVENT_RC_HANDLED which suppresses the
-    event for any remaining handlers as well as the normal end-of-track
-    processing */
-
-#endif
-#endif
+#endif /* __AUDIO_H */
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 6ce9bede41..e4397517db 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -53,9 +53,6 @@
 #define RDA5802    0x80 /* RDA Microelectronics */
 #define STFM1000   0x100 /* Sigmatel */
 
-/* CONFIG_CODEC */
-#define SWCODEC  1    /* if codec is done by SW */
-
 /* CONFIG_CPU */
 #define MCF5249      5249
 #define MCF5250      5250
@@ -903,7 +900,6 @@ Lyre prototype 1 */
 #define HAVE_PICTUREFLOW_INTEGRATION
 #endif
 
-#if (CONFIG_CODEC == SWCODEC)
 #ifdef BOOTLOADER
 
 #ifdef HAVE_BOOTLOADER_USB_MODE
@@ -975,8 +971,6 @@ Lyre prototype 1 */
 #define HAVE_CROSSFADE
 #endif
 
-#endif /*  (CONFIG_CODEC == SWCODEC) */
-
 /* Determine if accesses should be strictly long aligned. */
 #if defined(CPU_ARM) || defined(CPU_MIPS)
 #define ROCKBOX_STRICT_ALIGN 1
@@ -1248,19 +1242,16 @@ Lyre prototype 1 */
 #define HAVE_PCM_FULL_DUPLEX
 #endif
 
-#if (CONFIG_CODEC == SWCODEC)
 #define HAVE_PITCHCONTROL
-#endif
 
 /* enable logging messages to disk*/
-#if !defined(BOOTLOADER) && !defined(__PCTOOL__) && (CONFIG_CODEC == SWCODEC)
+#if !defined(BOOTLOADER) && !defined(__PCTOOL__)
 #define ROCKBOX_HAS_LOGDISKF
 #endif
 
 #if defined(HAVE_SDL_AUDIO) \
     && !(CONFIG_PLATFORM & PLATFORM_MAEMO5) \
-    && !defined(HAVE_SW_VOLUME_CONTROL) \
-    && CONFIG_CODEC == SWCODEC
+    && !defined(HAVE_SW_VOLUME_CONTROL)
 /* SW volume is needed for accurate control and no double buffering should be
  * required. If target uses SW volume, then its definitions are used instead
  * so things are as on target. */
diff --git a/firmware/export/config/agptekrocker.h b/firmware/export/config/agptekrocker.h
index a943ff4273..3d5565f1d9 100644
--- a/firmware/export/config/agptekrocker.h
+++ b/firmware/export/config/agptekrocker.h
@@ -75,8 +75,8 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x100000
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 #define HAVE_ROCKER_CODEC
 
 #define HAVE_HEADPHONE_DETECTION
diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h
index 2aee700f08..fa95ade999 100644
--- a/firmware/export/config/android.h
+++ b/firmware/export/config/android.h
@@ -67,8 +67,8 @@
 
 #define AB_REPEAT_ENABLE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #define HAVE_MULTIMEDIA_KEYS
 #define CONFIG_KEYPAD ANDROID_PAD
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h
index 167f1125a1..f0e117dd7a 100644
--- a/firmware/export/config/cowond2.h
+++ b/firmware/export/config/cowond2.h
@@ -107,8 +107,8 @@
 
 #define AB_REPEAT_ENABLE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* The D2 uses a WM8985 codec */
 #define HAVE_WM8985
diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h
index 0033b7d4eb..234556dd23 100644
--- a/firmware/export/config/creativezen.h
+++ b/firmware/export/config/creativezen.h
@@ -89,8 +89,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* LCD dimensions */
 #define LCD_WIDTH  320
diff --git a/firmware/export/config/creativezenmozaic.h b/firmware/export/config/creativezenmozaic.h
index 3a95d0388a..c8397f26bb 100644
--- a/firmware/export/config/creativezenmozaic.h
+++ b/firmware/export/config/creativezenmozaic.h
@@ -90,8 +90,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* LCD dimensions */
 #define LCD_WIDTH  128
diff --git a/firmware/export/config/creativezenv.h b/firmware/export/config/creativezenv.h
index 3e9be8ba29..fcdc39242f 100644
--- a/firmware/export/config/creativezenv.h
+++ b/firmware/export/config/creativezenv.h
@@ -87,8 +87,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* LCD dimensions */
 #define LCD_WIDTH  132
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h
index 35bd1efdfb..2eb747687a 100644
--- a/firmware/export/config/creativezenxfi.h
+++ b/firmware/export/config/creativezenxfi.h
@@ -94,8 +94,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* LCD dimensions */
 #define LCD_WIDTH  320
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h
index 3945311e29..9e5c748cd9 100644
--- a/firmware/export/config/creativezenxfi2.h
+++ b/firmware/export/config/creativezenxfi2.h
@@ -97,8 +97,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* LCD dimensions */
 #define LCD_WIDTH  240
diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h
index d72b41d608..a3626800bd 100644
--- a/firmware/export/config/creativezenxfi3.h
+++ b/firmware/export/config/creativezenxfi3.h
@@ -97,8 +97,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* Define this if you have a speaker */
 #define HAVE_SPEAKER
diff --git a/firmware/export/config/creativezenxfistyle.h b/firmware/export/config/creativezenxfistyle.h
index 0c6cd470e3..afb2b18db4 100644
--- a/firmware/export/config/creativezenxfistyle.h
+++ b/firmware/export/config/creativezenxfistyle.h
@@ -94,8 +94,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* LCD dimensions */
 #define LCD_WIDTH  320
diff --git a/firmware/export/config/creativezv.h b/firmware/export/config/creativezv.h
index ce812d38c9..a38c72afaa 100644
--- a/firmware/export/config/creativezv.h
+++ b/firmware/export/config/creativezv.h
@@ -80,8 +80,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 //#define CONFIG_RTC RTC_RX5X348AB
diff --git a/firmware/export/config/gigabeatfx.h b/firmware/export/config/gigabeatfx.h
index c9e20ad8a7..2382cb9d43 100644
--- a/firmware/export/config/gigabeatfx.h
+++ b/firmware/export/config/gigabeatfx.h
@@ -69,8 +69,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_S3C2440
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h
index 928e8c0e60..1a60fff38f 100644
--- a/firmware/export/config/gigabeats.h
+++ b/firmware/export/config/gigabeats.h
@@ -59,8 +59,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_MC13783
diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config/gogearhdd1630.h
index 773d3fe158..4a4f7b10d4 100644
--- a/firmware/export/config/gogearhdd1630.h
+++ b/firmware/export/config/gogearhdd1630.h
@@ -85,8 +85,8 @@
 /* define this if the target has volume keys which can be used in the lists */
 #define HAVE_VOLUME_IN_LIST
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock. The HDD16x0 has a PCF8563 RTC,
    but it's register compatible with the E8564. */
diff --git a/firmware/export/config/gogearhdd6330.h b/firmware/export/config/gogearhdd6330.h
index 3f89240a48..921ca637f2 100644
--- a/firmware/export/config/gogearhdd6330.h
+++ b/firmware/export/config/gogearhdd6330.h
@@ -85,8 +85,8 @@
 /* define this if the target has volume keys which can be used in the lists */
 #define HAVE_VOLUME_IN_LIST
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock. The HDD16x0 has a PCF8563 RTC,
    but it's register compatible with the E8564. */
diff --git a/firmware/export/config/gogearsa9200.h b/firmware/export/config/gogearsa9200.h
index f0487fcbb3..c1aeb527cd 100644
--- a/firmware/export/config/gogearsa9200.h
+++ b/firmware/export/config/gogearsa9200.h
@@ -68,8 +68,8 @@
 /* define this if the target has volume keys which can be used in the lists */
 #define HAVE_VOLUME_IN_LIST
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* There is no hardware tone control */
 #define HAVE_SW_TONE_CONTROLS
diff --git a/firmware/export/config/hifietma8.h b/firmware/export/config/hifietma8.h
index 0cd63f9d14..48c4145c80 100644
--- a/firmware/export/config/hifietma8.h
+++ b/firmware/export/config/hifietma8.h
@@ -75,8 +75,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #define CONFIG_LCD LCD_ILI9342
 
diff --git a/firmware/export/config/hifietma8c.h b/firmware/export/config/hifietma8c.h
index 0fc93ab61f..72b5ea7ee4 100644
--- a/firmware/export/config/hifietma8c.h
+++ b/firmware/export/config/hifietma8c.h
@@ -75,8 +75,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #define CONFIG_LCD LCD_ILI9342C
 
diff --git a/firmware/export/config/hifietma9.h b/firmware/export/config/hifietma9.h
index c7a206f0f4..6b96afde08 100644
--- a/firmware/export/config/hifietma9.h
+++ b/firmware/export/config/hifietma9.h
@@ -75,8 +75,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #define CONFIG_LCD LCD_ILI9342
 
diff --git a/firmware/export/config/hifietma9c.h b/firmware/export/config/hifietma9c.h
index ff312aa94f..5bdb28cd6e 100644
--- a/firmware/export/config/hifietma9c.h
+++ b/firmware/export/config/hifietma9c.h
@@ -75,8 +75,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #define CONFIG_LCD LCD_ILI9342C
 
diff --git a/firmware/export/config/hifimanhm60x.h b/firmware/export/config/hifimanhm60x.h
index 9cb9713bc8..fc718ba935 100644
--- a/firmware/export/config/hifimanhm60x.h
+++ b/firmware/export/config/hifimanhm60x.h
@@ -90,8 +90,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 /* #define CONFIG_RTC RTC_NANO2G */
diff --git a/firmware/export/config/hifimanhm801.h b/firmware/export/config/hifimanhm801.h
index 023b532e3c..049c4a40b5 100644
--- a/firmware/export/config/hifimanhm801.h
+++ b/firmware/export/config/hifimanhm801.h
@@ -87,8 +87,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #define CONFIG_LCD LCD_HX8340B
 
diff --git a/firmware/export/config/iaudio7.h b/firmware/export/config/iaudio7.h
index 8d03e04be2..0cc8b19787 100644
--- a/firmware/export/config/iaudio7.h
+++ b/firmware/export/config/iaudio7.h
@@ -107,8 +107,8 @@
 
 #define AB_REPEAT_ENABLE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* The iaudio7 uses built-in WM8731 codec */
 #define HAVE_WM8731
diff --git a/firmware/export/config/iaudiom3.h b/firmware/export/config/iaudiom3.h
index 8dd7396ca3..06ada6b8d5 100644
--- a/firmware/export/config/iaudiom3.h
+++ b/firmware/export/config/iaudiom3.h
@@ -73,8 +73,8 @@
 #define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 /* #define CONFIG_RTC  FIXME: most probably none */
diff --git a/firmware/export/config/iaudiom5.h b/firmware/export/config/iaudiom5.h
index 19c77ceb2d..9619fd36bb 100644
--- a/firmware/export/config/iaudiom5.h
+++ b/firmware/export/config/iaudiom5.h
@@ -92,8 +92,8 @@
 #define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_PCF50606
diff --git a/firmware/export/config/iaudiox5.h b/firmware/export/config/iaudiox5.h
index d74c4472e9..0b520bf12c 100644
--- a/firmware/export/config/iaudiox5.h
+++ b/firmware/export/config/iaudiox5.h
@@ -94,8 +94,8 @@
 #define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_PCF50606
diff --git a/firmware/export/config/ibassodx50.h b/firmware/export/config/ibassodx50.h
index e26d43c4a7..9ebad8b120 100644
--- a/firmware/export/config/ibassodx50.h
+++ b/firmware/export/config/ibassodx50.h
@@ -95,8 +95,8 @@
 /* Which backlight fading type? */
 #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 #define HAVE_SW_TONE_CONTROLS
 #define HAVE_SW_VOLUME_CONTROL
 #define HW_SAMPR_CAPS SAMPR_CAP_ALL
diff --git a/firmware/export/config/ibassodx90.h b/firmware/export/config/ibassodx90.h
index 6de06d9e27..7f8b3725c8 100644
--- a/firmware/export/config/ibassodx90.h
+++ b/firmware/export/config/ibassodx90.h
@@ -94,8 +94,8 @@
 /* Which backlight fading type? */
 #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 #define HAVE_SW_TONE_CONTROLS
 #define HAVE_SW_VOLUME_CONTROL
 #define HW_SAMPR_CAPS SAMPR_CAP_ALL
diff --git a/firmware/export/config/ihifi760.h b/firmware/export/config/ihifi760.h
index 3e6d3e8449..06ed3640a3 100644
--- a/firmware/export/config/ihifi760.h
+++ b/firmware/export/config/ihifi760.h
@@ -90,8 +90,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 /* #define CONFIG_RTC RTC_NANO2G */
diff --git a/firmware/export/config/ihifi770.h b/firmware/export/config/ihifi770.h
index 5215b2f637..f2c28bee2d 100644
--- a/firmware/export/config/ihifi770.h
+++ b/firmware/export/config/ihifi770.h
@@ -91,8 +91,8 @@
 /* Define this if a programmable hotkey is mapped */
 /* #define HAVE_HOTKEY */
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 /* #define CONFIG_RTC RTC_NANO2G */
diff --git a/firmware/export/config/ihifi770c.h b/firmware/export/config/ihifi770c.h
index 41081dc0e8..589ef44046 100644
--- a/firmware/export/config/ihifi770c.h
+++ b/firmware/export/config/ihifi770c.h
@@ -91,8 +91,8 @@
 /* Define this if a programmable hotkey is mapped */
 /* #define HAVE_HOTKEY */
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 /* #define CONFIG_RTC RTC_NANO2G */
diff --git a/firmware/export/config/ihifi800.h b/firmware/export/config/ihifi800.h
index 63ae764e14..9ee488111c 100644
--- a/firmware/export/config/ihifi800.h
+++ b/firmware/export/config/ihifi800.h
@@ -91,8 +91,8 @@
 /* Define this if a programmable hotkey is mapped */
 /* #define HAVE_HOTKEY */
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 /* #define CONFIG_RTC RTC_NANO2G */
diff --git a/firmware/export/config/ihifi960.h b/firmware/export/config/ihifi960.h
index 99c1fcd5b1..9b0c1fe7e2 100644
--- a/firmware/export/config/ihifi960.h
+++ b/firmware/export/config/ihifi960.h
@@ -90,8 +90,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 /* #define CONFIG_RTC RTC_NANO2G */
diff --git a/firmware/export/config/ipod1g2g.h b/firmware/export/config/ipod1g2g.h
index 1d0fd5c9fb..5dfac2e0c3 100644
--- a/firmware/export/config/ipod1g2g.h
+++ b/firmware/export/config/ipod1g2g.h
@@ -92,8 +92,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
diff --git a/firmware/export/config/ipod3g.h b/firmware/export/config/ipod3g.h
index b34bd6547b..3914d9f654 100644
--- a/firmware/export/config/ipod3g.h
+++ b/firmware/export/config/ipod3g.h
@@ -92,8 +92,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_PCF50605
diff --git a/firmware/export/config/ipod4g.h b/firmware/export/config/ipod4g.h
index 785491a9ab..e838174701 100644
--- a/firmware/export/config/ipod4g.h
+++ b/firmware/export/config/ipod4g.h
@@ -84,8 +84,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_PCF50605
diff --git a/firmware/export/config/ipod6g.h b/firmware/export/config/ipod6g.h
index b4be39d935..d3c4805389 100644
--- a/firmware/export/config/ipod6g.h
+++ b/firmware/export/config/ipod6g.h
@@ -110,8 +110,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_NANO2G
diff --git a/firmware/export/config/ipodcolor.h b/firmware/export/config/ipodcolor.h
index 33533f925f..6292b97d58 100644
--- a/firmware/export/config/ipodcolor.h
+++ b/firmware/export/config/ipodcolor.h
@@ -71,8 +71,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_PCF50605
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config/ipodmini1g.h
index 4f9f1b3dd9..84481550f1 100644
--- a/firmware/export/config/ipodmini1g.h
+++ b/firmware/export/config/ipodmini1g.h
@@ -93,8 +93,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_PCF50605
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h
index 977eb3da3f..ffc566920d 100644
--- a/firmware/export/config/ipodmini2g.h
+++ b/firmware/export/config/ipodmini2g.h
@@ -85,8 +85,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_PCF50605
diff --git a/firmware/export/config/ipodnano1g.h b/firmware/export/config/ipodnano1g.h
index 81d4a0ae4c..8ca7544dbe 100644
--- a/firmware/export/config/ipodnano1g.h
+++ b/firmware/export/config/ipodnano1g.h
@@ -74,8 +74,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_PCF50605
diff --git a/firmware/export/config/ipodnano2g.h b/firmware/export/config/ipodnano2g.h
index 0693cedc14..362258a822 100644
--- a/firmware/export/config/ipodnano2g.h
+++ b/firmware/export/config/ipodnano2g.h
@@ -111,8 +111,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_NANO2G
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config/ipodvideo.h
index 7f1d83f4a5..d48f7e3387 100644
--- a/firmware/export/config/ipodvideo.h
+++ b/firmware/export/config/ipodvideo.h
@@ -70,8 +70,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_PCF50605
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config/iriverh10.h
index efa0c993a1..ed3157020a 100644
--- a/firmware/export/config/iriverh10.h
+++ b/firmware/export/config/iriverh10.h
@@ -79,8 +79,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #ifndef BOOTLOADER
diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config/iriverh100.h
index 33d79cb194..798ee27f44 100644
--- a/firmware/export/config/iriverh100.h
+++ b/firmware/export/config/iriverh100.h
@@ -73,8 +73,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* Define this if you have an remote lcd */
 #define HAVE_REMOTE_LCD
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config/iriverh10_5gb.h
index 4d3c3f28b0..b75e834a1f 100644
--- a/firmware/export/config/iriverh10_5gb.h
+++ b/firmware/export/config/iriverh10_5gb.h
@@ -62,8 +62,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #ifndef BOOTLOADER
diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config/iriverh120.h
index 2c3a67330a..e1cfda768b 100644
--- a/firmware/export/config/iriverh120.h
+++ b/firmware/export/config/iriverh120.h
@@ -73,8 +73,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a disk storage, i.e. something
    that needs spinups and can cause skips when shaked */
diff --git a/firmware/export/config/iriverh300.h b/firmware/export/config/iriverh300.h
index 0be9d0da7a..15c5448aed 100644
--- a/firmware/export/config/iriverh300.h
+++ b/firmware/export/config/iriverh300.h
@@ -66,8 +66,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_PCF50606
diff --git a/firmware/export/config/iriverifp7xx.h b/firmware/export/config/iriverifp7xx.h
index db905c4674..cb48d9713d 100644
--- a/firmware/export/config/iriverifp7xx.h
+++ b/firmware/export/config/iriverifp7xx.h
@@ -41,8 +41,8 @@
 
 #define HAVE_FAT16SUPPORT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
diff --git a/firmware/export/config/logikdax.h b/firmware/export/config/logikdax.h
index 0168cd810b..5f35c6e725 100644
--- a/firmware/export/config/logikdax.h
+++ b/firmware/export/config/logikdax.h
@@ -80,8 +80,8 @@
 
 #define AB_REPEAT_ENABLE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* The DAX uses built-in WM8731 codec */
 #define HAVE_WM8731
diff --git a/firmware/export/config/lyreproto1.h b/firmware/export/config/lyreproto1.h
index 2ec1199acb..5281a4a864 100644
--- a/firmware/export/config/lyreproto1.h
+++ b/firmware/export/config/lyreproto1.h
@@ -61,8 +61,8 @@
 
 #define CONFIG_KEYPAD LYRE_PROTO1_PAD
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* The number of bytes reserved for loadable codecs */
 #define CODEC_SIZE 0x100000
diff --git a/firmware/export/config/meizum3.h b/firmware/export/config/meizum3.h
index 9c88db0621..161330d38f 100644
--- a/firmware/export/config/meizum3.h
+++ b/firmware/export/config/meizum3.h
@@ -77,8 +77,8 @@
 //#define AB_REPEAT_ENABLE
 //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 //#define CONFIG_RTC RTC_S5L8700
diff --git a/firmware/export/config/meizum6sl.h b/firmware/export/config/meizum6sl.h
index 7d568f3319..267950b9e2 100644
--- a/firmware/export/config/meizum6sl.h
+++ b/firmware/export/config/meizum6sl.h
@@ -77,8 +77,8 @@
 //#define AB_REPEAT_ENABLE
 //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_S5L8700
diff --git a/firmware/export/config/meizum6sp.h b/firmware/export/config/meizum6sp.h
index 35dd84c589..dc9e2f657e 100644
--- a/firmware/export/config/meizum6sp.h
+++ b/firmware/export/config/meizum6sp.h
@@ -83,8 +83,8 @@
 //#define AB_REPEAT_ENABLE
 //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_S5L8700
diff --git a/firmware/export/config/mini2440.h b/firmware/export/config/mini2440.h
index b872b78f83..f78c101c80 100644
--- a/firmware/export/config/mini2440.h
+++ b/firmware/export/config/mini2440.h
@@ -114,8 +114,8 @@
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_S3C2440
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* The number of bytes reserved for loadable codecs */
 #define CODEC_SIZE 0x100000
diff --git a/firmware/export/config/mpiohd200.h b/firmware/export/config/mpiohd200.h
index b6539e3a44..da2420b814 100644
--- a/firmware/export/config/mpiohd200.h
+++ b/firmware/export/config/mpiohd200.h
@@ -67,8 +67,8 @@
 
 #define CONFIG_KEYPAD MPIO_HD200_PAD
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #define CONFIG_LCD LCD_TL0350A
 #define HAVE_LCD_SHUTDOWN
diff --git a/firmware/export/config/mpiohd300.h b/firmware/export/config/mpiohd300.h
index 7858672301..bf0821e1a9 100644
--- a/firmware/export/config/mpiohd300.h
+++ b/firmware/export/config/mpiohd300.h
@@ -67,8 +67,8 @@
 
 #define CONFIG_KEYPAD MPIO_HD300_PAD
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* Define this if you have RTC */
 #define CONFIG_RTC RTC_S35380A
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config/mrobe100.h
index 5b6a489550..f2ecb5a6f0 100644
--- a/firmware/export/config/mrobe100.h
+++ b/firmware/export/config/mrobe100.h
@@ -67,8 +67,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #ifndef BOOTLOADER
diff --git a/firmware/export/config/mrobe500.h b/firmware/export/config/mrobe500.h
index 32b4f7c99d..82a4ef28d1 100644
--- a/firmware/export/config/mrobe500.h
+++ b/firmware/export/config/mrobe500.h
@@ -143,8 +143,8 @@
 /* define this if the target has volume keys which can be used in the lists */
 #define HAVE_VOLUME_IN_LIST
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 //#define HAVE_HARDWARE_BEEP
 
diff --git a/firmware/export/config/nokian8xx.h b/firmware/export/config/nokian8xx.h
index 566683c760..4204fddf1d 100644
--- a/firmware/export/config/nokian8xx.h
+++ b/firmware/export/config/nokian8xx.h
@@ -57,8 +57,8 @@
 
 #define AB_REPEAT_ENABLE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* Work around debug macro expansion of strncmp in scratchbox */
 #define _HAVE_STRING_ARCH_strncmp
diff --git a/firmware/export/config/nokian900.h b/firmware/export/config/nokian900.h
index c6d6eb8205..bf692af312 100644
--- a/firmware/export/config/nokian900.h
+++ b/firmware/export/config/nokian900.h
@@ -57,8 +57,8 @@
 
 #define AB_REPEAT_ENABLE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* Work around debug macro expansion of strncmp in scratchbox */
 #define _HAVE_STRING_ARCH_strncmp
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config/ondavx747.h
index bf2c47e05c..e14edb3e37 100644
--- a/firmware/export/config/ondavx747.h
+++ b/firmware/export/config/ondavx747.h
@@ -87,8 +87,8 @@
 #define HAVE_TOUCHSCREEN
 #define HAVE_BUTTON_DATA
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_JZ4740
diff --git a/firmware/export/config/ondavx767.h b/firmware/export/config/ondavx767.h
index 3718d202a2..dbad0b6a95 100644
--- a/firmware/export/config/ondavx767.h
+++ b/firmware/export/config/ondavx767.h
@@ -76,8 +76,8 @@
 
 #define CONFIG_KEYPAD ONDAVX767_PAD
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_JZ4740
diff --git a/firmware/export/config/ondavx777.h b/firmware/export/config/ondavx777.h
index 17e3eda165..7225096237 100644
--- a/firmware/export/config/ondavx777.h
+++ b/firmware/export/config/ondavx777.h
@@ -81,8 +81,8 @@
 #define HAVE_TOUCHSCREEN
 #define HAVE_BUTTON_DATA
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_JZ4740
diff --git a/firmware/export/config/pandora.h b/firmware/export/config/pandora.h
index bd11441dd7..27745073ec 100644
--- a/firmware/export/config/pandora.h
+++ b/firmware/export/config/pandora.h
@@ -57,8 +57,8 @@
 
 #define AB_REPEAT_ENABLE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* Work around debug macro expansion of strncmp in scratchbox */
 #define _HAVE_STRING_ARCH_strncmp
diff --git a/firmware/export/config/rk27generic.h b/firmware/export/config/rk27generic.h
index 69cf9f3758..c116f17603 100644
--- a/firmware/export/config/rk27generic.h
+++ b/firmware/export/config/rk27generic.h
@@ -95,8 +95,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 /* #define CONFIG_RTC RTC_NANO2G */
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h
index 51c829c70b..4980084a07 100644
--- a/firmware/export/config/samsungyh820.h
+++ b/firmware/export/config/samsungyh820.h
@@ -102,8 +102,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a disk storage, i.e. something
    that needs spinups and can cause skips when shaked */
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h
index 0f7060c02f..aaf93609b0 100644
--- a/firmware/export/config/samsungyh920.h
+++ b/firmware/export/config/samsungyh920.h
@@ -95,8 +95,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #ifndef BOOTLOADER
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h
index 8c102d7fd1..10e9743f3a 100644
--- a/firmware/export/config/samsungyh925.h
+++ b/firmware/export/config/samsungyh925.h
@@ -92,8 +92,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #ifndef BOOTLOADER
diff --git a/firmware/export/config/samsungypr0.h b/firmware/export/config/samsungypr0.h
index 212eaa8ec2..e9596fb9cc 100644
--- a/firmware/export/config/samsungypr0.h
+++ b/firmware/export/config/samsungypr0.h
@@ -84,8 +84,8 @@
 #define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_HOTKEY
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* R0 KeyPad configuration for plugins */
 #define CONFIG_KEYPAD SAMSUNG_YPR0_PAD
diff --git a/firmware/export/config/samsungypr1.h b/firmware/export/config/samsungypr1.h
index 710cc3a3db..0021f81a52 100644
--- a/firmware/export/config/samsungypr1.h
+++ b/firmware/export/config/samsungypr1.h
@@ -89,8 +89,8 @@
 
 #define AB_REPEAT_ENABLE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* R1 KeyPad configuration for plugins */
 #define CONFIG_KEYPAD SAMSUNG_YPR1_PAD
diff --git a/firmware/export/config/samsungyps3.h b/firmware/export/config/samsungyps3.h
index 3843a3c08d..3707507f72 100644
--- a/firmware/export/config/samsungyps3.h
+++ b/firmware/export/config/samsungyps3.h
@@ -80,8 +80,8 @@
 //#define AB_REPEAT_ENABLE
 //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_S35390A
diff --git a/firmware/export/config/samsungypz5.h b/firmware/export/config/samsungypz5.h
index 882acc2a6c..8c013e7c29 100644
--- a/firmware/export/config/samsungypz5.h
+++ b/firmware/export/config/samsungypz5.h
@@ -94,8 +94,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* LCD dimensions */
 #define LCD_WIDTH  128
diff --git a/firmware/export/config/sansac100.h b/firmware/export/config/sansac100.h
index 109977ed06..7e984762d6 100644
--- a/firmware/export/config/sansac100.h
+++ b/firmware/export/config/sansac100.h
@@ -68,8 +68,8 @@
 
 #define AB_REPEAT_ENABLE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* Define this if you have the TLV320 audio codec */
 #define HAVE_TLV320
diff --git a/firmware/export/config/sansac200.h b/firmware/export/config/sansac200.h
index 4e8ea55002..1eed043b8c 100644
--- a/firmware/export/config/sansac200.h
+++ b/firmware/export/config/sansac200.h
@@ -84,8 +84,8 @@
 /* define this if the target has volume keys which can be used in the lists */
 #define HAVE_VOLUME_IN_LIST
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* There is no hardware tone control */
 #define HAVE_SW_TONE_CONTROLS
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h
index a51f9e3b00..e98b44d0e8 100644
--- a/firmware/export/config/sansac200v2.h
+++ b/firmware/export/config/sansac200v2.h
@@ -88,8 +88,8 @@
 /* define this if the target has volume keys which can be used in the lists */
 #define HAVE_VOLUME_IN_LIST
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* There is no hardware tone control */
 #define HAVE_SW_TONE_CONTROLS
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h
index 35496e5fda..70f66779a4 100644
--- a/firmware/export/config/sansaclip.h
+++ b/firmware/export/config/sansaclip.h
@@ -93,8 +93,8 @@
 /* define this if the target has volume keys which can be used in the lists */
 #define HAVE_VOLUME_IN_LIST
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 /* There is no hardware tone control */
 #define HAVE_SW_TONE_CONTROLS
 
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index 851884da36..54ffdb1071 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -103,8 +103,8 @@
 
 #define HAVE_GUI_BOOST
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 /* There is no hardware tone control */
 #define HAVE_SW_TONE_CONTROLS
 
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h
index 581f6e900f..04c2efacfa 100644
--- a/firmware/export/config/sansaclipv2.h
+++ b/firmware/export/config/sansaclipv2.h
@@ -97,8 +97,8 @@
 
 #define HAVE_GUI_BOOST
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 /* There is no hardware tone control */
 #define HAVE_SW_TONE_CONTROLS
 
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h
index 8c2e3404d4..9513b0074c 100644
--- a/firmware/export/config/sansaclipzip.h
+++ b/firmware/export/config/sansaclipzip.h
@@ -98,8 +98,8 @@
 
 #define HAVE_GUI_BOOST
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 /* There is no hardware tone control */
 #define HAVE_SW_TONE_CONTROLS
 
diff --git a/firmware/export/config/sansaconnect.h b/firmware/export/config/sansaconnect.h
index 9e6be6cbee..8ad4cab396 100644
--- a/firmware/export/config/sansaconnect.h
+++ b/firmware/export/config/sansaconnect.h
@@ -101,8 +101,8 @@
 
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 //#define HAVE_HARDWARE_BEEP
 
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config/sansae200.h
index db3ccb1c1c..af9baa3202 100644
--- a/firmware/export/config/sansae200.h
+++ b/firmware/export/config/sansae200.h
@@ -82,8 +82,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 /* There is no hardware tone control */
 #define HAVE_SW_TONE_CONTROLS
 /* The PP5024 has a built-in AustriaMicrosystems AS3514 */
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h
index 96b51f4e12..604f51db23 100644
--- a/firmware/export/config/sansae200v2.h
+++ b/firmware/export/config/sansae200v2.h
@@ -84,8 +84,8 @@
 /* Define this to have CPU boosted while scrolling in the UI */
 #define HAVE_GUI_BOOST
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* There is no hardware tone control */
 #define HAVE_SW_TONE_CONTROLS
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h
index fae3463d75..e918cd888f 100644
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config/sansafuze.h
@@ -91,8 +91,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 
 /* LCD dimensions */
diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h
index 2a57619b06..bd587be11a 100644
--- a/firmware/export/config/sansafuzeplus.h
+++ b/firmware/export/config/sansafuzeplus.h
@@ -95,8 +95,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* LCD dimensions */
 #define LCD_WIDTH  240
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h
index b85e0747a3..1fa03cf6be 100644
--- a/firmware/export/config/sansafuzev2.h
+++ b/firmware/export/config/sansafuzev2.h
@@ -102,8 +102,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 
 /* LCD dimensions */
diff --git a/firmware/export/config/sansam200.h b/firmware/export/config/sansam200.h
index fa4a129e26..044802550e 100644
--- a/firmware/export/config/sansam200.h
+++ b/firmware/export/config/sansam200.h
@@ -77,8 +77,8 @@
 
 #define AB_REPEAT_ENABLE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* Define this if you have the TLV320 audio codec */
 #define HAVE_TLV320
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h
index d905d10c95..7415ba7dae 100644
--- a/firmware/export/config/sansam200v4.h
+++ b/firmware/export/config/sansam200v4.h
@@ -92,8 +92,8 @@
 #define CONFIG_TUNER TEA5767
 #define CONFIG_TUNER_XTAL 32768
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* Define this if you have the TLV320 audio codec */
 /*#define HAVE_TLV320*/
diff --git a/firmware/export/config/sansaview.h b/firmware/export/config/sansaview.h
index 21083da7cb..1057c5e817 100644
--- a/firmware/export/config/sansaview.h
+++ b/firmware/export/config/sansaview.h
@@ -71,8 +71,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 /* There is no hardware tone control */
 /* #define HAVE_SW_TONE_CONTROLS*/
 #define HAVE_WM8731
diff --git a/firmware/export/config/sdlapp.h b/firmware/export/config/sdlapp.h
index 626bd5c99f..dde0b2783c 100644
--- a/firmware/export/config/sdlapp.h
+++ b/firmware/export/config/sdlapp.h
@@ -65,8 +65,8 @@
 
 #define AB_REPEAT_ENABLE
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #define HAVE_SCROLLWHEEL
 #define CONFIG_KEYPAD SDL_PAD
diff --git a/firmware/export/config/sonynwze360.h b/firmware/export/config/sonynwze360.h
index a25e95d274..0049f13123 100644
--- a/firmware/export/config/sonynwze360.h
+++ b/firmware/export/config/sonynwze360.h
@@ -83,8 +83,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* LCD dimensions */
 #define LCD_WIDTH  240
diff --git a/firmware/export/config/sonynwze370.h b/firmware/export/config/sonynwze370.h
index 2ed87f2f1b..f0e6d08e0d 100644
--- a/firmware/export/config/sonynwze370.h
+++ b/firmware/export/config/sonynwze370.h
@@ -80,8 +80,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* LCD dimensions */
 #define LCD_WIDTH  128
diff --git a/firmware/export/config/sonynwzlinux.h b/firmware/export/config/sonynwzlinux.h
index 00b606b1e3..771cef57bb 100644
--- a/firmware/export/config/sonynwzlinux.h
+++ b/firmware/export/config/sonynwzlinux.h
@@ -59,8 +59,8 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x100000
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #define CONFIG_TUNER SI4700
 
diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config/tatungtpj1022.h
index 7c25039f9f..7f3b579c49 100644
--- a/firmware/export/config/tatungtpj1022.h
+++ b/firmware/export/config/tatungtpj1022.h
@@ -45,8 +45,8 @@
 
 #define CONFIG_KEYPAD TATUNG_TPJ1022_PAD
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 #ifndef BOOTLOADER
diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h
index 8e61726434..0626fe1078 100644
--- a/firmware/export/config/vibe500.h
+++ b/firmware/export/config/vibe500.h
@@ -75,8 +75,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 /* Philips 8563T - E8564 is a clone of it */
diff --git a/firmware/export/config/xduoox20.h b/firmware/export/config/xduoox20.h
index 018e32888f..b453e42a9c 100644
--- a/firmware/export/config/xduoox20.h
+++ b/firmware/export/config/xduoox20.h
@@ -72,8 +72,8 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x100000
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #define HAVE_HEADPHONE_DETECTION
 
diff --git a/firmware/export/config/xduoox3.h b/firmware/export/config/xduoox3.h
index 14f9369567..3d35555ebf 100644
--- a/firmware/export/config/xduoox3.h
+++ b/firmware/export/config/xduoox3.h
@@ -81,8 +81,8 @@
 /* Define this if a programmable hotkey is mapped */
 #define HAVE_HOTKEY
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #ifndef BOOTLOADER
 /* define this if you have a real-time clock */
diff --git a/firmware/export/config/xduoox3ii.h b/firmware/export/config/xduoox3ii.h
index 886d91dc0f..fb72532993 100644
--- a/firmware/export/config/xduoox3ii.h
+++ b/firmware/export/config/xduoox3ii.h
@@ -72,8 +72,8 @@
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x100000
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 #define HAVE_HEADPHONE_DETECTION
 
diff --git a/firmware/export/config/zenvisionm30gb.h b/firmware/export/config/zenvisionm30gb.h
index 6ce2876551..5fa5496b20 100644
--- a/firmware/export/config/zenvisionm30gb.h
+++ b/firmware/export/config/zenvisionm30gb.h
@@ -81,8 +81,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 //#define CONFIG_RTC RTC_RX5X348AB
diff --git a/firmware/export/config/zenvisionm60gb.h b/firmware/export/config/zenvisionm60gb.h
index 5510e9a338..23e92ddb0a 100644
--- a/firmware/export/config/zenvisionm60gb.h
+++ b/firmware/export/config/zenvisionm60gb.h
@@ -80,8 +80,8 @@
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
 
-/* Define this if you do software codec */
-#define CONFIG_CODEC SWCODEC
+
+
 
 /* define this if you have a real-time clock */
 //#define CONFIG_RTC RTC_RX5X348AB
diff --git a/firmware/export/general.h b/firmware/export/general.h
index 16c824086b..9762823998 100644
--- a/firmware/export/general.h
+++ b/firmware/export/general.h
@@ -26,7 +26,6 @@
 #include <stddef.h>
 #include "config.h"
 
-#if CONFIG_CODEC == SWCODEC
 /* round a signed/unsigned 32bit value to the closest of a list of values */
 /* returns the index of the closest value */
 int round_value_to_list32(unsigned long value,
@@ -38,7 +37,6 @@ int make_list_from_caps32(unsigned long src_mask,
                           const unsigned long *src_list,
                           unsigned long caps_mask,
                           unsigned long *caps_list);
-#endif /* CONFIG_CODEC == SWCODEC */
 
 /* Create a filename with a number part in a way that the number is 1
  * higher than the highest numbered file matching the same pattern.
diff --git a/firmware/export/mp3_playback.h b/firmware/export/mp3_playback.h
deleted file mode 100644
index 51efb45651..0000000000
--- a/firmware/export/mp3_playback.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Code that has been in mpeg.c/h before, now creating an encapsulated play
- * data module, to be used by other sources than file playback as well.
- *
- * Copyright (C) 2004 by Linus Nielsen Feltzing
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-#ifndef _MP3_PLAYBACK_H_
-#define _MP3_PLAYBACK_H_
-
-#include <stdbool.h>
-
-/* callback fn */
-#ifndef MP3_PLAY_CALLBACK_DEFINED
-#define MP3_PLAY_CALLBACK_DEFINED
-typedef void (*mp3_play_callback_t)(const void **start, size_t* size);
-#endif
-
-/* functions formerly in mpeg.c */
-void mp3_init(int volume, int bass, int treble, int balance, int loudness,
-              int avc, int channel_config, int stereo_width,
-              int mdb_strength, int mdb_harmonics,
-              int mdb_center, int mdb_shape, bool mdb_enable,
-              bool superbass);
-
-void mp3_play_data(const void* start, size_t size,
-                   mp3_play_callback_t get_more);
-void mp3_play_pause(bool play);
-bool mp3_pause_done(void);
-void mp3_play_stop(void);
-bool mp3_is_playing(void);
-unsigned char* mp3_get_pos(void);
-void mp3_shutdown(void);
-
-#endif /* #ifndef _MP3_PLAYBACK_H_ */