6 files changed, 57 insertions, 18 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index e080491e2c..15d9039018 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -1467,3 +1467,8 @@ id: LANG_INVERT_CURSOR
 desc: in settings_menu
 eng: "Invert cursor"
 new:
+
+id: LANG_RECORDING_EDITABLE
+desc: Editable recordings setting
+eng: "Editable files"
+new:
diff --git a/apps/onplay.c b/apps/onplay.c
index 3ba4c1b49c..14e3cdd7a7 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -251,11 +251,11 @@ static bool vbr_fix(void)
                                   flen, xingupdate);
 
     if(num_frames) {
-        /* Note: We don't need to pass any values for mpeg_version and
-           sample_rate because they will be extracted from the mpeg stream */
+        /* Note: We don't need to pass a template header because it will be
+           taken from the mpeg stream */
         framelen = create_xing_header(fd, entry.first_frame_offset,
                                       flen, xingbuf, num_frames,
-                                      0, 0, xingupdate, true);
+                                      0, xingupdate, true);
         
         /* Try to fit the Xing header first in the stream. Replace the existing
            VBR header if there is one, else see if there is room between the
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index cf295db19c..14bd37d950 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -169,7 +169,8 @@ bool recording_screen(void)
     mpeg_set_recording_options(global_settings.rec_frequency,
                                global_settings.rec_quality,
                                global_settings.rec_source,
-                               global_settings.rec_channels);
+                               global_settings.rec_channels,
+                               global_settings.rec_editable);
 
     set_gain();
 
@@ -312,22 +313,29 @@ bool recording_screen(void)
                 mpeg_set_recording_options(global_settings.rec_frequency,
                                            global_settings.rec_quality,
                                            global_settings.rec_source,
-                                           global_settings.rec_channels);
+                                           global_settings.rec_channels,
+                                           global_settings.rec_editable);
                 
                 set_gain();
                 update_countdown = 1; /* Update immediately */
                 break;
 
             case BUTTON_F2:
-                if (f2_rec_screen())
-                    return SYS_USB_CONNECTED;
-                update_countdown = 1; /* Update immediately */
+                if(mpeg_status())
+                {
+                    if (f2_rec_screen())
+                        return SYS_USB_CONNECTED;
+                    update_countdown = 1; /* Update immediately */
+                }
                 break;
 
             case BUTTON_F3:
-                if (f3_rec_screen())
-                    return SYS_USB_CONNECTED;
-                update_countdown = 1; /* Update immediately */
+                if(mpeg_status())
+                {
+                    if (f3_rec_screen())
+                        return SYS_USB_CONNECTED;
+                    update_countdown = 1; /* Update immediately */
+                }
                 break;
 
         }
@@ -537,7 +545,8 @@ bool f2_rec_screen(void)
     mpeg_set_recording_options(global_settings.rec_frequency,
                                global_settings.rec_quality,
                                global_settings.rec_source,
-                               global_settings.rec_channels);
+                               global_settings.rec_channels,
+                               global_settings.rec_editable);
 
     set_gain();
     
@@ -621,7 +630,8 @@ bool f3_rec_screen(void)
     mpeg_set_recording_options(global_settings.rec_frequency,
                                global_settings.rec_quality,
                                global_settings.rec_source,
-                               global_settings.rec_channels);
+                               global_settings.rec_channels,
+                               global_settings.rec_editable);
 
     set_gain();
     
diff --git a/apps/settings.c b/apps/settings.c
index 8c132c5f9b..8b74df852b 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -96,8 +96,8 @@ offset  abs
 0x16    0x2a    <(int) Byte offset into resume file>
 0x1a    0x2e    <time until disk spindown>
 0x1b    0x2f    <browse current, play selected, queue_resume>
-0x1c    0x30    <peak meter hold timeout (bit 0-4)>, 
-                 peak_meter_performance (bit 7)
+0x1c    0x30    <peak meter hold timeout (bit 0-4),
+                 rec_editable (bit 7)>
 0x1d    0x31    <(int) queue resume index>
 0x21    0x35    <repeat mode (bit 0-1), rec. channels (bit 2),
                  mic gain (bit 4-7)>
@@ -125,7 +125,7 @@ modified unless the header & checksum test fails.
 
 Rest of config block, only saved to disk:
 0xAE  fade on pause/unpause/stop setting (bit 0)
-0xB0  peak meter clip hold timeout (bit 0-4)
+0xB0  peak meter clip hold timeout (bit 0-4), peak meter performance (bit 7)
 0xB1  peak meter release step size, peak_meter_dbfs (bit 7)
 0xB2  peak meter min either in -db or in percent
 0xB3  peak meter max either in -db or in percent
@@ -341,7 +341,8 @@ int settings_save( void )
          ((global_settings.play_selected & 1) << 1) |
          ((global_settings.queue_resume & 3) << 2));
     
-    config_block[0x1c] = (unsigned char)global_settings.peak_meter_hold;
+    config_block[0x1c] = (unsigned char)global_settings.peak_meter_hold |
+        (global_settings.rec_editable?0x80:0);
 
     memcpy(&config_block[0x1d], &global_settings.queue_resume_index, 4);
 
@@ -617,8 +618,11 @@ void settings_load(void)
             global_settings.queue_resume = (config_block[0x1b] >> 2) & 3;
         }
 
-        if (config_block[0x1c] != 0xFF)
+        if (config_block[0x1c] != 0xFF) {
             global_settings.peak_meter_hold = (config_block[0x1c]) & 0x1f;
+            global_settings.rec_editable =
+                config_block[0x1c]?true:false;
+        }
 
         if (config_block[0x1d] != 0xFF)
             memcpy(&global_settings.queue_resume_index, &config_block[0x1d],
@@ -1029,6 +1033,9 @@ bool settings_load_config(char* file)
             static char* options[] = {"stereo", "mono"};
             set_cfg_option(&global_settings.rec_channels, value, options, 2);
         }
+        else if (!strcasecmp(name, "editable recordings")) {
+            set_cfg_bool(&global_settings.rec_editable, value);
+        }
 #endif
         else if (!strcasecmp(name, "idle poweroff")) {
             static char* options[] = {"off","1","2","3","4","5","6","7","8",
@@ -1434,6 +1441,14 @@ bool settings_save_config(void)
              global_settings.rec_left_gain,
              global_settings.rec_right_gain);
     write(fd, buf, strlen(buf));
+
+    {
+        static char* options[] = {"off", "on"};
+        snprintf(buf, sizeof(buf), "editable recordings: %s\r\n",
+                 options[global_settings.rec_editable]);
+        write(fd, buf, strlen(buf));
+    }
+
 #endif
     close(fd);
 
@@ -1467,6 +1482,7 @@ void settings_reset(void) {
     global_settings.rec_mic_gain = 8;
     global_settings.rec_left_gain = 2; /* 0dB */
     global_settings.rec_right_gain = 2; /* 0dB */
+    global_settings.rec_editable = false;
     global_settings.resume      = RESUME_ASK;
     global_settings.contrast    = DEFAULT_CONTRAST_SETTING;
     global_settings.invert      = DEFAULT_INVERT_SETTING;
diff --git a/apps/settings.h b/apps/settings.h
index 7876a18afa..0ff7cb2102 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -74,6 +74,7 @@ struct user_settings
     int rec_mic_gain; /* 0-15 */
     int rec_left_gain; /* 0-15 */
     int rec_right_gain; /* 0-15 */
+    bool rec_editable; /* true means that the bit reservoir is off */
     
     /* device settings */
 
diff --git a/apps/sound_menu.c b/apps/sound_menu.c
index 9ac95e46b8..84d389a47a 100644
--- a/apps/sound_menu.c
+++ b/apps/sound_menu.c
@@ -219,6 +219,12 @@ static bool recquality(void)
                    &global_settings.rec_quality, 
                    NULL, 1, 0, 7 );
 }
+
+static bool receditable(void)
+{
+    return set_bool(str(LANG_RECORDING_EDITABLE),
+                    &global_settings.rec_editable);
+}
 #endif /* HAVE_MAS3587F */
 
 static void set_chanconf(int val)
@@ -275,6 +281,7 @@ bool recording_menu(void)
         { str(LANG_RECORDING_FREQUENCY), recfrequency },
         { str(LANG_RECORDING_SOURCE), recsource },
         { str(LANG_RECORDING_CHANNELS), recchannels },
+        { str(LANG_RECORDING_EDITABLE), receditable },
     };
     
     m=menu_init( items, sizeof items / sizeof(struct menu_items) );