diff options
-rw-r--r-- | apps/recorder/recording.c | 19 | ||||
-rw-r--r-- | firmware/mpeg.c | 6 |
2 files changed, 13 insertions, 12 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index ade7e5146f..e301cd322e 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -53,6 +53,9 @@ extern int mp3buf_write; | |||
53 | extern int mp3buf_read; | 53 | extern int mp3buf_read; |
54 | extern bool recording; | 54 | extern bool recording; |
55 | 55 | ||
56 | extern unsigned long record_start_frame; /* Frame number where | ||
57 | recording started */ | ||
58 | |||
56 | #define SOURCE_MIC 0 | 59 | #define SOURCE_MIC 0 |
57 | #define SOURCE_LINE 1 | 60 | #define SOURCE_LINE 1 |
58 | #define SOURCE_SPDIF 2 | 61 | #define SOURCE_SPDIF 2 |
@@ -122,8 +125,6 @@ void adjust_cursor(void) | |||
122 | } | 125 | } |
123 | } | 126 | } |
124 | 127 | ||
125 | #define BLINK_INTERVAL 2 | ||
126 | |||
127 | unsigned int frame_times[] = | 128 | unsigned int frame_times[] = |
128 | { | 129 | { |
129 | 2612, /* 44.1kHz */ | 130 | 2612, /* 44.1kHz */ |
@@ -161,10 +162,10 @@ bool recording_screen(void) | |||
161 | int w, h; | 162 | int w, h; |
162 | int update_countdown = 1; | 163 | int update_countdown = 1; |
163 | bool have_recorded = false; | 164 | bool have_recorded = false; |
164 | bool blink_toggle = false; | ||
165 | unsigned long seconds; | 165 | unsigned long seconds; |
166 | unsigned long last_seconds = 0; | 166 | unsigned long last_seconds = 0; |
167 | int hours, minutes; | 167 | int hours, minutes; |
168 | unsigned long val; | ||
168 | 169 | ||
169 | cursor = 0; | 170 | cursor = 0; |
170 | mpeg_init_recording(); | 171 | mpeg_init_recording(); |
@@ -360,12 +361,12 @@ bool recording_screen(void) | |||
360 | 361 | ||
361 | lcd_clear_display(); | 362 | lcd_clear_display(); |
362 | 363 | ||
363 | if(mpeg_status() & MPEG_STATUS_RECORD) | 364 | /* DEBUG: Read the current frame */ |
364 | { | 365 | mas_readmem(MAS_BANK_D0, 0xfd0, &val, 1); |
365 | blink_toggle = blink_toggle?false:true; | 366 | |
366 | if(blink_toggle) | 367 | snprintf(buf, 32, "%05x:%05x:%05x", |
367 | lcd_puts(0, 0, "Recording"); | 368 | mpeg_num_recorded_frames(), val, record_start_frame); |
368 | } | 369 | lcd_puts(0, 0, buf); |
369 | 370 | ||
370 | hours = seconds / 3600; | 371 | hours = seconds / 3600; |
371 | minutes = (seconds - (hours * 3600)) / 60; | 372 | minutes = (seconds - (hours * 3600)) / 60; |
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 0ed52ed6cb..82073a6405 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -482,8 +482,8 @@ static int lowest_watermark_level; /* Debug value to observe the buffer | |||
482 | #ifdef HAVE_MAS3587F | 482 | #ifdef HAVE_MAS3587F |
483 | static bool is_recording; /* We are recording */ | 483 | static bool is_recording; /* We are recording */ |
484 | static bool stop_pending; | 484 | static bool stop_pending; |
485 | static unsigned long record_start_frame; /* Frame number where | 485 | unsigned long record_start_frame; /* Frame number where |
486 | recording started */ | 486 | recording started */ |
487 | static bool saving; /* We are saving the buffer to disk */ | 487 | static bool saving; /* We are saving the buffer to disk */ |
488 | #endif | 488 | #endif |
489 | 489 | ||
@@ -2187,7 +2187,7 @@ unsigned long mpeg_num_recorded_frames(void) | |||
2187 | { | 2187 | { |
2188 | /* Read the current frame */ | 2188 | /* Read the current frame */ |
2189 | mas_readmem(MAS_BANK_D0, 0xfd0, &val, 1); | 2189 | mas_readmem(MAS_BANK_D0, 0xfd0, &val, 1); |
2190 | 2190 | ||
2191 | return val - record_start_frame; | 2191 | return val - record_start_frame; |
2192 | } | 2192 | } |
2193 | else | 2193 | else |