From 254566b1138ffe19fa087dc2a8133f71f3398dc0 Mon Sep 17 00:00:00 2001 From: Nicolas Pennequin Date: Thu, 8 May 2008 19:01:21 +0000 Subject: Cleanup in tools/: Remove unused VB scripts and fix properties. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17421 a1c6a512-1295-4272-9138-f99709370657 --- tools/creative.h | 88 ++++++++--------- tools/hmac-sha1.h | 246 +++++++++++++++++++++++------------------------ tools/mkinfo.pl | 2 +- tools/sapi5_init_tts.vbs | 29 ------ tools/sapi5_stop_tts.vbs | 18 ---- tools/sapi5_voice.vbs | 68 ------------- tools/sapi_voice.vbs | 0 tools/voicefont.h | 2 +- tools/wavtrim.h | 2 +- tools/wn2rdf.pl | 0 10 files changed, 170 insertions(+), 285 deletions(-) delete mode 100755 tools/sapi5_init_tts.vbs delete mode 100755 tools/sapi5_stop_tts.vbs delete mode 100755 tools/sapi5_voice.vbs mode change 100755 => 100644 tools/sapi_voice.vbs mode change 100644 => 100755 tools/wn2rdf.pl (limited to 'tools') diff --git a/tools/creative.h b/tools/creative.h index d8bfcd0b01..a4ca9ce2da 100644 --- a/tools/creative.h +++ b/tools/creative.h @@ -1,44 +1,44 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Maurus Cuelenaere - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef CREATIVE_H_ -#define CREATIVE_H_ - -enum -{ - ZENVISIONM = 0, - ZENVISIONM60 = 1, - ZENVISION = 2, - ZENV = 3, - ZEN = 4 -}; - -struct device_info -{ - const char* cinf; /*Must be Unicode encoded*/ - const unsigned int cinf_size; - const char* null; - const unsigned char* bootloader; - const unsigned int bootloader_size; - const unsigned int memory_address; -}; - -int zvm_encode(char *iname, char *oname, int device); - -#endif /*CREATIVE_H_*/ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2008 by Maurus Cuelenaere + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#ifndef CREATIVE_H_ +#define CREATIVE_H_ + +enum +{ + ZENVISIONM = 0, + ZENVISIONM60 = 1, + ZENVISION = 2, + ZENV = 3, + ZEN = 4 +}; + +struct device_info +{ + const char* cinf; /*Must be Unicode encoded*/ + const unsigned int cinf_size; + const char* null; + const unsigned char* bootloader; + const unsigned int bootloader_size; + const unsigned int memory_address; +}; + +int zvm_encode(char *iname, char *oname, int device); + +#endif /*CREATIVE_H_*/ diff --git a/tools/hmac-sha1.h b/tools/hmac-sha1.h index b3969d6148..5652690686 100644 --- a/tools/hmac-sha1.h +++ b/tools/hmac-sha1.h @@ -1,123 +1,123 @@ -/* Taken from gnulib (http://savannah.gnu.org/projects/gnulib/) */ -/* Declarations of functions and data types used for SHA1 sum - library functions. - Copyright (C) 2000, 2001, 2003, 2005, 2006 Free Software Foundation, Inc. - - 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, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -#ifndef SHA1_H -#define SHA1_H 1 - -#include -#include - -/* Structure to save state of computation between the single steps. */ -struct sha1_ctx -{ - uint32_t A; - uint32_t B; - uint32_t C; - uint32_t D; - uint32_t E; - - uint32_t total[2]; - uint32_t buflen; - uint32_t buffer[32]; -}; - - -/* Initialize structure containing state of computation. */ -extern void sha1_init_ctx (struct sha1_ctx *ctx); - -/* Starting with the result of former calls of this function (or the - initialization function update the context for the next LEN bytes - starting at BUFFER. - It is necessary that LEN is a multiple of 64!!! */ -extern void sha1_process_block (const void *buffer, size_t len, - struct sha1_ctx *ctx); - -/* Starting with the result of former calls of this function (or the - initialization function update the context for the next LEN bytes - starting at BUFFER. - It is NOT required that LEN is a multiple of 64. */ -extern void sha1_process_bytes (const void *buffer, size_t len, - struct sha1_ctx *ctx); - -/* Process the remaining bytes in the buffer and put result from CTX - in first 20 bytes following RESBUF. The result is always in little - endian byte order, so that a byte-wise output yields to the wanted - ASCII representation of the message digest. - - IMPORTANT: On some systems it is required that RESBUF be correctly - aligned for a 32 bits value. */ -extern void *sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf); - - -/* Put result from CTX in first 20 bytes following RESBUF. The result is - always in little endian byte order, so that a byte-wise output yields - to the wanted ASCII representation of the message digest. - - IMPORTANT: On some systems it is required that RESBUF is correctly - aligned for a 32 bits value. */ -extern void *sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf); - - -/* Compute SHA1 message digest for bytes read from STREAM. The - resulting message digest number will be written into the 20 bytes - beginning at RESBLOCK. */ -extern int sha1_stream (FILE *stream, void *resblock); - -/* Compute SHA1 message digest for LEN bytes beginning at BUFFER. The - result is always in little endian byte order, so that a byte-wise - output yields to the wanted ASCII representation of the message - digest. */ -extern void *sha1_buffer (const char *buffer, size_t len, void *resblock); - -#endif - - -/* hmac.h -- hashed message authentication codes - Copyright (C) 2005 Free Software Foundation, Inc. - - 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, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -/* Written by Simon Josefsson. */ - -#ifndef HMAC_H -#define HMAC_H 1 - -#include - -/* Compute Hashed Message Authentication Code with SHA-1, over BUFFER - data of BUFLEN bytes using the KEY of KEYLEN bytes, writing the - output to pre-allocated 20 byte minimum RESBUF buffer. Return 0 on - success. */ -int -hmac_sha1 (const void *key, size_t keylen, - const void *in, size_t inlen, void *resbuf); - -#endif /* HMAC_H */ +/* Taken from gnulib (http://savannah.gnu.org/projects/gnulib/) */ +/* Declarations of functions and data types used for SHA1 sum + library functions. + Copyright (C) 2000, 2001, 2003, 2005, 2006 Free Software Foundation, Inc. + + 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, or (at your option) any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef SHA1_H +#define SHA1_H 1 + +#include +#include + +/* Structure to save state of computation between the single steps. */ +struct sha1_ctx +{ + uint32_t A; + uint32_t B; + uint32_t C; + uint32_t D; + uint32_t E; + + uint32_t total[2]; + uint32_t buflen; + uint32_t buffer[32]; +}; + + +/* Initialize structure containing state of computation. */ +extern void sha1_init_ctx (struct sha1_ctx *ctx); + +/* Starting with the result of former calls of this function (or the + initialization function update the context for the next LEN bytes + starting at BUFFER. + It is necessary that LEN is a multiple of 64!!! */ +extern void sha1_process_block (const void *buffer, size_t len, + struct sha1_ctx *ctx); + +/* Starting with the result of former calls of this function (or the + initialization function update the context for the next LEN bytes + starting at BUFFER. + It is NOT required that LEN is a multiple of 64. */ +extern void sha1_process_bytes (const void *buffer, size_t len, + struct sha1_ctx *ctx); + +/* Process the remaining bytes in the buffer and put result from CTX + in first 20 bytes following RESBUF. The result is always in little + endian byte order, so that a byte-wise output yields to the wanted + ASCII representation of the message digest. + + IMPORTANT: On some systems it is required that RESBUF be correctly + aligned for a 32 bits value. */ +extern void *sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf); + + +/* Put result from CTX in first 20 bytes following RESBUF. The result is + always in little endian byte order, so that a byte-wise output yields + to the wanted ASCII representation of the message digest. + + IMPORTANT: On some systems it is required that RESBUF is correctly + aligned for a 32 bits value. */ +extern void *sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf); + + +/* Compute SHA1 message digest for bytes read from STREAM. The + resulting message digest number will be written into the 20 bytes + beginning at RESBLOCK. */ +extern int sha1_stream (FILE *stream, void *resblock); + +/* Compute SHA1 message digest for LEN bytes beginning at BUFFER. The + result is always in little endian byte order, so that a byte-wise + output yields to the wanted ASCII representation of the message + digest. */ +extern void *sha1_buffer (const char *buffer, size_t len, void *resblock); + +#endif + + +/* hmac.h -- hashed message authentication codes + Copyright (C) 2005 Free Software Foundation, Inc. + + 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, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Simon Josefsson. */ + +#ifndef HMAC_H +#define HMAC_H 1 + +#include + +/* Compute Hashed Message Authentication Code with SHA-1, over BUFFER + data of BUFLEN bytes using the KEY of KEYLEN bytes, writing the + output to pre-allocated 20 byte minimum RESBUF buffer. Return 0 on + success. */ +int +hmac_sha1 (const void *key, size_t keylen, + const void *in, size_t inlen, void *resbuf); + +#endif /* HMAC_H */ diff --git a/tools/mkinfo.pl b/tools/mkinfo.pl index ed2c2e695d..734e9ecc23 100755 --- a/tools/mkinfo.pl +++ b/tools/mkinfo.pl @@ -5,7 +5,7 @@ # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ # \/ \/ \/ \/ \/ -# $Id: configure 13215 2007-04-20 11:58:39Z bagder $ +# $Id$ # # Purpose: extract and gather info from a build and put that in a standard # way in the output file. Meant to be put in rockbox zip package to help and diff --git a/tools/sapi5_init_tts.vbs b/tools/sapi5_init_tts.vbs deleted file mode 100755 index 466ee5ce71..0000000000 --- a/tools/sapi5_init_tts.vbs +++ /dev/null @@ -1,29 +0,0 @@ -'*************************************************************************** -' __________ __ ___. -' Open \______ \ ____ ____ | | _\_ |__ _______ ___ -' Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -' Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -' Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -' \/ \/ \/ \/ \/ -' $Id: sapi5_init_tts.vbs$ -' -' Copyright (C) 2007 Steve Bavin, Jens Arnold, Mesar Hameed -' -' All files in this archive are subject to the GNU General Public License. -' See the file COPYING in the source tree root for full license agreement. -' -' This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -' KIND, either express or implied. -' -'*************************************************************************** -Dim oSpVoice, sVoice - -Set oSpVoice = CreateObject("SAPI.SpVoice") -If Err.Number <> 0 Then - WScript.Echo "Error - could not get SpVoice object. " & _ - "SAPI 5 not installed?" - Err.Clear - WScript.Quit 1 -End If - -WScript.Quit 0 diff --git a/tools/sapi5_stop_tts.vbs b/tools/sapi5_stop_tts.vbs deleted file mode 100755 index eee149bf08..0000000000 --- a/tools/sapi5_stop_tts.vbs +++ /dev/null @@ -1,18 +0,0 @@ -'*************************************************************************** -' __________ __ ___. -' Open \______ \ ____ ____ | | _\_ |__ _______ ___ -' Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -' Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -' Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -' \/ \/ \/ \/ \/ -' $Id: sapi5_stop_tts.vbs$ -' -' Copyright (C) 2007 Steve Bavin, Jens Arnold, Mesar Hameed -' -' All files in this archive are subject to the GNU General Public License. -' See the file COPYING in the source tree root for full license agreement. -' -' This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -' KIND, either express or implied. -' -'*************************************************************************** diff --git a/tools/sapi5_voice.vbs b/tools/sapi5_voice.vbs deleted file mode 100755 index c37836afb4..0000000000 --- a/tools/sapi5_voice.vbs +++ /dev/null @@ -1,68 +0,0 @@ -'*************************************************************************** -' __________ __ ___. -' Open \______ \ ____ ____ | | _\_ |__ _______ ___ -' Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -' Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -' Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -' \/ \/ \/ \/ \/ -' $Id: sapi5_voice.vbs$ -' -' Copyright (C) 2007 Steve Bavin, Jens Arnold, Mesar Hameed -' -' All files in this archive are subject to the GNU General Public License. -' See the file COPYING in the source tree root for full license agreement. -' -' This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -' KIND, either express or implied. -' -'*************************************************************************** -' Purpose: Make a voice clip file for the given text -' Parameters: $0 - text to convert -' $1 - file to write spoken text into (WAV format) - - - -'To be done: -' - Somehow, persist oSpVoice across multiple clips to increase speed -' - Allow user to override voice, speed and/or format (currently uses Control Panel defaults for voice/speed) -' - Voice specific replacements/corrections for pronounciation (this should be at a higher level really) - -Const SSFMCreateForWrite = 3 - -Const SPSF_8kHz16BitMono = 6 -Const SPSF_11kHz16BitMono = 10 -Const SPSF_12kHz16BitMono = 14 -Const SPSF_16kHz16BitMono = 18 -Const SPSF_22kHz16BitMono = 22 -Const SPSF_24kHz16BitMono = 26 -Const SPSF_32kHz16BitMono = 30 -Const SPSF_44kHz16BitMono = 34 -Const SPSF_48kHz16BitMono = 38 - -Dim oSpVoice, oSpFS, nAudioFormat, sText, sOutputFile - -sText = Replace(WScript.Arguments(0), "\", "") -sOutputFile = WScript.Arguments(1) -nAudioFormat = SPSF_22kHz16BitMono 'Audio format to use, recommended settings: - '- for AT&T natural voices, use SPSF_32kHz16BitMono - '- for MS voices, use SPSF_22kHz16BitMono - -Set oSpVoice = CreateObject("SAPI.SpVoice") -If Err.Number <> 0 Then - WScript.Echo "Error - could not get SpVoice object. " & _ - "SAPI 5 not installed?" - Err.Clear - WScript.Quit 1 -End If - -Set oSpFS = CreateObject("SAPI.SpFileStream") -oSpFS.Format.Type = nAudioFormat -oSpFS.Open sOutputFile, SSFMCreateForWrite, False -Set oSpVoice.AudioOutputStream = oSpFS -oSpVoice.Speak sText -oSpFS.Close - -Set oSpFS = Nothing -Set oSpVoice = Nothing -Set oArgs = Nothing -WScript.Quit 0 diff --git a/tools/sapi_voice.vbs b/tools/sapi_voice.vbs old mode 100755 new mode 100644 diff --git a/tools/voicefont.h b/tools/voicefont.h index 23e3f32eb7..9db6bcaf39 100644 --- a/tools/voicefont.h +++ b/tools/voicefont.h @@ -5,7 +5,7 @@ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ - * $Id: voicefont.h 15675 2007-11-18 22:01:31Z amiconn $ + * $Id$ * * Copyright (C) 2004 by Jörg Hohensohn * diff --git a/tools/wavtrim.h b/tools/wavtrim.h index 314c842536..46c8ff871b 100644 --- a/tools/wavtrim.h +++ b/tools/wavtrim.h @@ -5,7 +5,7 @@ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ - * $Id: wavtrim.h 14229 2007-08-07 10:21:03Z linus $ + * $Id$ * * Copyright (C) 2004 by Jörg Hohensohn * diff --git a/tools/wn2rdf.pl b/tools/wn2rdf.pl old mode 100644 new mode 100755 -- cgit