diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/main.c | 2 | ||||
| -rw-r--r-- | apps/menus/main_menu.c | 4 | ||||
| -rw-r--r-- | apps/misc.c | 4 | ||||
| -rw-r--r-- | apps/plugin.c | 2 | ||||
| -rw-r--r-- | apps/plugin.h | 2 | ||||
| -rw-r--r-- | apps/plugins/battery_bench.c | 4 | ||||
| -rw-r--r-- | apps/plugins/iriver_flash.c | 2 | ||||
| -rw-r--r-- | apps/plugins/settings_dumper.c | 2 | ||||
| -rw-r--r-- | apps/settings.c | 2 | ||||
| -rw-r--r-- | apps/version.h | 26 |
10 files changed, 11 insertions, 39 deletions
diff --git a/apps/main.c b/apps/main.c index e4b9286..e8043a7 100644 --- a/apps/main.c +++ b/apps/main.c @@ -120,8 +120,6 @@ /*#define AUTOROCK*/ /* define this to check for "autostart.rock" on boot */ -const char appsversion[]=APPSVERSION; - static void init(void); #ifdef HAVE_SDL diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 59a72e1..76ceaa4 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -172,7 +172,7 @@ static const char* info_getname(int selected_item, void *data, { case INFO_VERSION: snprintf(buffer, buffer_len, "%s: %s", - str(LANG_VERSION), appsversion); + str(LANG_VERSION), rbversion); break; case INFO_BUFFER: /* buffer */ @@ -259,7 +259,7 @@ static int info_speak_item(int selected_item, void * data) { case INFO_VERSION: /* version */ talk_id(LANG_VERSION, false); - talk_spell(appsversion, true); + talk_spell(rbversion, true); break; case INFO_BUFFER: /* buffer */ diff --git a/apps/misc.c b/apps/misc.c index 95c0dd6..747abe0 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -621,7 +621,7 @@ int show_logo( void ) char version[32]; int font_h, font_w; - snprintf(version, sizeof(version), "Ver. %s", appsversion); + snprintf(version, sizeof(version), "Ver. %s", rbversion); lcd_clear_display(); #if defined(SANSA_CLIP) || defined(SANSA_CLIPV2) || defined(SANSA_CLIPPLUS) @@ -646,7 +646,7 @@ int show_logo( void ) lcd_clear_display(); lcd_double_height(true); lcd_puts(0, 0, rockbox); - lcd_puts_scroll(0, 1, appsversion); + lcd_puts_scroll(0, 1, rbversion); #endif lcd_update(); diff --git a/apps/plugin.c b/apps/plugin.c index 83f27ea..d626ef6 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -718,7 +718,7 @@ static const struct plugin_api rockbox_api = { semaphore_release, #endif - appsversion, + rbversion, /* new stuff at the end, sort into place next time the API gets incompatible */ }; diff --git a/apps/plugin.h b/apps/plugin.h index 7e198c9..a6b864b 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -885,7 +885,7 @@ int (*round_value_to_list32)(unsigned long value, void (*semaphore_release)(struct semaphore *s); #endif - const char *appsversion; + const char *rbversion; /* new stuff at the end, sort into place next time the API gets incompatible */ }; diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 165ce54..945abe9 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -546,7 +546,7 @@ int main(void) "will continue.\n\n",BATTERY_LOG); rb->fdprintf(fd, "Battery bench run for %s version %s\n\n" - ,MODEL_NAME,rb->appsversion); + ,MODEL_NAME,rb->rbversion); rb->fdprintf(fd, "Battery type: %d mAh Buffer Entries: %d\n" @@ -578,7 +578,7 @@ int main(void) rb->fdprintf(fd, "\n--File already present. Resuming Benchmark--\n"); rb->fdprintf(fd, "Battery bench run for %s version %s\n\n" - ,MODEL_NAME,rb->appsversion); + ,MODEL_NAME,rb->rbversion); rb->close(fd); } diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c index 3f5490e..24542a9 100644 --- a/apps/plugins/iriver_flash.c +++ b/apps/plugins/iriver_flash.c @@ -411,7 +411,7 @@ int flash_rockbox(const char *filename, int section) rb->memset(&hdr, 0, sizeof(struct flash_header)); hdr.magic = FLASH_MAGIC; hdr.length = len; - // rb->strncpy(hdr.version, APPSVERSION, sizeof(hdr.version)-1); + // rb->strncpy(hdr.version, rb->rbversion , sizeof(hdr.version)-1); p16 = (uint16_t *)&hdr; rb->snprintf(buf, sizeof(buf), "Programming..."); diff --git a/apps/plugins/settings_dumper.c b/apps/plugins/settings_dumper.c index ea69353..93c4f67 100644 --- a/apps/plugins/settings_dumper.c +++ b/apps/plugins/settings_dumper.c @@ -129,7 +129,7 @@ enum plugin_status plugin_start( return PLUGIN_ERROR; list = rb->get_settings_list(&setting_count); rb->fdprintf(fd, "# .cfg file created by rockbox %s - " - "http://www.rockbox.org\r\n\r\n", rb->appsversion); + "http://www.rockbox.org\r\n\r\n", rb->rbversion); rb->fdprintf(fd, "# -- Sound settings -- #\r\n"); for(i=0;i<setting_count;i++) diff --git a/apps/settings.c b/apps/settings.c index 6349372..25593e5 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -536,7 +536,7 @@ static bool settings_write_config(const char* filename, int options) if (fd < 0) return false; fdprintf(fd, "# .cfg file created by rockbox %s - " - "http://www.rockbox.org\r\n\r\n", appsversion); + "http://www.rockbox.org\r\n\r\n", rbversion); for(i=0; i<nb_settings; i++) { if (settings[i].cfg_name == NULL) diff --git a/apps/version.h b/apps/version.h deleted file mode 100644 index 73828dd..0000000 --- a/apps/version.h +++ /dev/null @@ -1,26 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 Björn Stenberg - * - * 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 _VERSION_H_ -#define _VERSION_H_ - -extern const char appsversion[]; - -#endif |