diff options
Diffstat (limited to 'apps/recorder/recording.c')
-rw-r--r-- | apps/recorder/recording.c | 46 |
1 files changed, 2 insertions, 44 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index b39a96e60f..e964db1e23 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -810,6 +810,7 @@ bool recording_screen(bool no_source) | |||
810 | ID2P(LANG_GIGABYTE) | 810 | ID2P(LANG_GIGABYTE) |
811 | }; | 811 | }; |
812 | 812 | ||
813 | global_settings.recscreen_on = true; | ||
813 | cursor = 0; | 814 | cursor = 0; |
814 | #if (CONFIG_LED == LED_REAL) && !defined(SIMULATOR) | 815 | #if (CONFIG_LED == LED_REAL) && !defined(SIMULATOR) |
815 | ata_set_led_enabled(false); | 816 | ata_set_led_enabled(false); |
@@ -1353,7 +1354,6 @@ bool recording_screen(bool no_source) | |||
1353 | unsigned int dseconds, dhours, dminutes; | 1354 | unsigned int dseconds, dhours, dminutes; |
1354 | unsigned long num_recorded_bytes, dsize, dmb; | 1355 | unsigned long num_recorded_bytes, dsize, dmb; |
1355 | int pos = 0; | 1356 | int pos = 0; |
1356 | char spdif_sfreq[8]; | ||
1357 | 1357 | ||
1358 | update_countdown = 5; | 1358 | update_countdown = 5; |
1359 | last_seconds = seconds; | 1359 | last_seconds = seconds; |
@@ -1687,53 +1687,11 @@ bool recording_screen(bool no_source) | |||
1687 | PM_HEIGHT + 2, true); | 1687 | PM_HEIGHT + 2, true); |
1688 | } | 1688 | } |
1689 | } | 1689 | } |
1690 | /* Can't measure S/PDIF sample rate on Archos yet */ | ||
1691 | #if (CONFIG_CODEC != MAS3587F) && defined(HAVE_SPDIF_IN) && !defined(SIMULATOR) | ||
1692 | if (global_settings.rec_source == AUDIO_SRC_SPDIF) | ||
1693 | snprintf(spdif_sfreq, 8, "%dHz", audio_get_spdif_sample_rate()); | ||
1694 | #else | ||
1695 | (void)spdif_sfreq; | ||
1696 | #endif | ||
1697 | snprintf(buf, 32, "%s %s", | ||
1698 | #if (CONFIG_CODEC != MAS3587F) && defined(HAVE_SPDIF_IN) && !defined(SIMULATOR) | ||
1699 | global_settings.rec_source == AUDIO_SRC_SPDIF ? | ||
1700 | spdif_sfreq : | ||
1701 | #endif | ||
1702 | freq_str[global_settings.rec_frequency], | ||
1703 | global_settings.rec_channels ? | ||
1704 | str(LANG_SYSFONT_CHANNEL_MONO) : | ||
1705 | str(LANG_SYSFONT_CHANNEL_STEREO)); | ||
1706 | |||
1707 | for(i = 0; i < screen_update; i++) { | ||
1708 | #ifdef HAVE_AGC | ||
1709 | if ((global_settings.rec_source == AUDIO_SRC_MIC) | ||
1710 | || (global_settings.rec_source == AUDIO_SRC_LINEIN) | ||
1711 | || (global_settings.rec_source == AUDIO_SRC_FMRADIO)) | ||
1712 | screens[i].puts(0, filename_offset[i] + PM_HEIGHT + line[i] + 1, buf); | ||
1713 | else | ||
1714 | #endif | ||
1715 | screens[i].puts(0, filename_offset[i] + PM_HEIGHT + line[i], buf); | ||
1716 | } | ||
1717 | 1690 | ||
1718 | #ifdef HAVE_AGC | 1691 | #ifdef HAVE_AGC |
1719 | hist_time++; | 1692 | hist_time++; |
1720 | #endif | 1693 | #endif |
1721 | 1694 | ||
1722 | #if CONFIG_CODEC == SWCODEC | ||
1723 | snprintf(buf, 32, "%s", | ||
1724 | REC_QUALITY_LABEL(global_settings.rec_quality)); | ||
1725 | for(i = 0; i < screen_update; i++){ | ||
1726 | #ifdef HAVE_AGC | ||
1727 | if ((global_settings.rec_source == AUDIO_SRC_MIC) | ||
1728 | || (global_settings.rec_source == AUDIO_SRC_LINEIN) | ||
1729 | || (global_settings.rec_source == AUDIO_SRC_FMRADIO)) | ||
1730 | screens[i].puts(0, filename_offset[i] + PM_HEIGHT + line[i] + 2, buf); | ||
1731 | else | ||
1732 | #endif | ||
1733 | screens[i].puts(0, filename_offset[i] + PM_HEIGHT + line[i] + 1, buf); | ||
1734 | } | ||
1735 | #endif | ||
1736 | |||
1737 | for(i = 0; i < screen_update; i++) | 1695 | for(i = 0; i < screen_update; i++) |
1738 | { | 1696 | { |
1739 | gui_statusbar_draw(&(statusbars.statusbars[i]), true); | 1697 | gui_statusbar_draw(&(statusbars.statusbars[i]), true); |
@@ -1758,7 +1716,6 @@ bool recording_screen(bool no_source) | |||
1758 | } | 1716 | } |
1759 | } /* end while(!done) */ | 1717 | } /* end while(!done) */ |
1760 | 1718 | ||
1761 | |||
1762 | #if CONFIG_CODEC == SWCODEC | 1719 | #if CONFIG_CODEC == SWCODEC |
1763 | audio_stat = pcm_rec_status(); | 1720 | audio_stat = pcm_rec_status(); |
1764 | #else | 1721 | #else |
@@ -1806,6 +1763,7 @@ bool recording_screen(bool no_source) | |||
1806 | peak_meter_trigger(false); | 1763 | peak_meter_trigger(false); |
1807 | peak_meter_set_trigger_listener(NULL); | 1764 | peak_meter_set_trigger_listener(NULL); |
1808 | 1765 | ||
1766 | global_settings.recscreen_on = false; | ||
1809 | sound_settings_apply(); | 1767 | sound_settings_apply(); |
1810 | 1768 | ||
1811 | FOR_NB_SCREENS(i) | 1769 | FOR_NB_SCREENS(i) |