forked from KolibriOS/kolibrios
Fix EN typos
- Corrections for en_US language. - Some whitespace sanitation. git-svn-id: svn://kolibrios.org@10063 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
f4fd3f6ea0
commit
bb2607b7d8
@ -509,7 +509,7 @@ macro cmovz reg1, reg2 {
|
||||
|
||||
local ..jumpaddr
|
||||
|
||||
if __CPU_type eq p5 ; CMOVcc isnt supported on the P5
|
||||
if __CPU_type eq p5 ; CMOVcc is not supported on the P5
|
||||
jnz ..jumpaddr
|
||||
mov reg1, reg2
|
||||
..jumpaddr:
|
||||
@ -525,7 +525,7 @@ macro cmovnz reg1, reg2 {
|
||||
|
||||
local ..jumpaddr
|
||||
|
||||
if __CPU_type eq p5 ; CMOVcc isnt supported on the P5
|
||||
if __CPU_type eq p5 ; CMOVcc is not supported on the P5
|
||||
jz ..jumpaddr
|
||||
mov reg1, reg2
|
||||
..jumpaddr:
|
||||
@ -539,7 +539,7 @@ macro cmovg reg1, reg2 {
|
||||
|
||||
local ..jumpaddr
|
||||
|
||||
if __CPU_type eq p5 ; CMOVcc isnt supported on the P5
|
||||
if __CPU_type eq p5 ; CMOVcc is not supported on the P5
|
||||
jle ..jumpaddr
|
||||
mov reg1, reg2
|
||||
..jumpaddr:
|
||||
@ -552,7 +552,7 @@ macro cmovl reg1, reg2 {
|
||||
|
||||
local ..jumpaddr
|
||||
|
||||
if __CPU_type eq p5 ; CMOVcc isnt supported on the P5
|
||||
if __CPU_type eq p5 ; CMOVcc is not supported on the P5
|
||||
jge ..jumpaddr
|
||||
mov reg1, reg2
|
||||
..jumpaddr:
|
||||
|
||||
@ -4,25 +4,25 @@ Building AC97SND on windows.
|
||||
|
||||
- Microsoft Visual Studio (version 2005 or later)
|
||||
|
||||
- Flat assembler
|
||||
- Flat assembler
|
||||
Download and install fasm for windows from http://www.flatassembler.net
|
||||
Add fasm directory to windows PATH variable.
|
||||
(To check if this worked, open CMD and type fasm. Fasm's help messages should be visible now.)
|
||||
|
||||
- pe2kos.exe
|
||||
Can be found in some subdirectorys of SVN, official location unknown.
|
||||
This file will need to be placed in the same directory as dependecies, to build the final kolibrios executable
|
||||
- pe2kos.exe
|
||||
Can be found in some subdirectories of SVN, official location unknown.
|
||||
This file will need to be placed in the same directory as dependencies, to build the final KolibriOS executable
|
||||
|
||||
2. Collecting the dependencies:
|
||||
|
||||
- sound.lib
|
||||
Source code can be found at SVN\programs\develop\sdk\trunk\sound\src
|
||||
- sound.lib
|
||||
Source code can be found at \programs\develop\sdk\trunk\sound\src
|
||||
Building this is beyond the scope of this document for now.
|
||||
If you cant figure it out, or are lazy, you can download latest compiled version from autobuild server.
|
||||
Alternatively, you can download latest compiled version from the autobuild server.
|
||||
http://builds.kolibrios.org/eng/data/programs/develop/sdk/trunk/sound/src/sound.lib
|
||||
|
||||
- ufmod.obj
|
||||
Source code is at SVN\programs\develop\libraries\ufmod
|
||||
Source code is at \programs\develop\libraries\ufmod
|
||||
Build using makeobj.bat
|
||||
Or as above, download from:
|
||||
http://builds.kolibrios.org/eng/data/programs/develop/libraries/ufmod/ufmod.obj
|
||||
@ -33,12 +33,12 @@ Open ac97snd solution in visual studio, select mpg project and click build -> bu
|
||||
|
||||
3. Building AC97SND binary
|
||||
|
||||
You will need to copy all previously mentioned dependecies into the folder that visual studio expects to find them.
|
||||
This can be for example: SVN\programs\media\ac97snd\release\
|
||||
Alternatively, you can add another directory to 'Additional Library Directorys' in Projects Linker options.
|
||||
You will need to copy all previously mentioned dependencies into the folder that Visual Studio expects to find them.
|
||||
This can be for example: \programs\media\ac97snd\release\
|
||||
Alternatively, you can add another directory to 'Additional Library Directories' in Projects Linker options.
|
||||
Now select AC97SND project, and click build -> build AC97SND
|
||||
|
||||
|
||||
good luck!
|
||||
Good luck!
|
||||
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
;******************************************************************************
|
||||
; project name: SuperMP3
|
||||
; target platform: MenuetOS, x86 (IA-32), x86-64 achitectures
|
||||
; compiler: flat assembler 1.64
|
||||
; project name: SuperMP3
|
||||
; target platform: MenuetOS, x86 (IA-32), x86-64 architectures
|
||||
; compiler: flat assembler 1.64
|
||||
; version: 0.65
|
||||
; last update: 5th September 2005
|
||||
; maintained by: Sergey Kuzmin aka Wildwest
|
||||
; e-mail: kuzmin_serg@list.ru
|
||||
; last update: 5th September 2005
|
||||
; maintained by: Sergey Kuzmin aka Wildwest
|
||||
; e-mail: kuzmin_serg@list.ru
|
||||
;******************************************************************************
|
||||
; Summary:
|
||||
; Summary:
|
||||
; initial reader for mp3's headers
|
||||
; can read mostly needed parts from headers of almost all mp3 files
|
||||
; can be used in tag editor, mp3 player or converter later
|
||||
@ -15,7 +15,7 @@
|
||||
;******************************************************************************
|
||||
|
||||
;--------------------------------------------------------------------------------------
|
||||
;HISTORY:
|
||||
;HISTORY:
|
||||
|
||||
;0.7: MP3INFO 23/09/2018
|
||||
Sergey Efremenkov aka theonlymirage
|
||||
@ -23,58 +23,58 @@
|
||||
Kiril Lipatov aka Leency make app to open with param, small UI update
|
||||
|
||||
;0.65: SuperMP3
|
||||
Madis Kalme rewrited extract_bits (he used his Extracteax macro)
|
||||
Madis Kalme rewrited extract_bits (he used his Extracteax macro)
|
||||
and decode_bitrate functions
|
||||
|
||||
;0.64: Xing header reading: correct time, bitrate and number of
|
||||
frames for VBR files
|
||||
frames for VBR files
|
||||
;0.62: ID3v2 detecting and writing its version
|
||||
;0.61: Header search
|
||||
; Added 'Header found at' field
|
||||
; If file has no frames, error message is shown
|
||||
;0.61: Header search
|
||||
; Added 'Header found at' field
|
||||
; If file has no frames, error message is shown
|
||||
; Russian tag support (in windows-1251 encoding)
|
||||
;
|
||||
;0.6: SuperMP3 (not finished and its future in the dark) 19/08/2005
|
||||
;
|
||||
;0.6: SuperMP3 (not finished and its future in the dark) 19/08/2005
|
||||
;Author: Sergey Kuzmin aka Wildwest <kuzmin_serg@list.ru>
|
||||
;Additions: Alexei Ershov aka ealex <e-al@yandex.ru>
|
||||
;Features: added checking of CRC bit;
|
||||
; improved frame_size calculation (thanks to Alexei Ershov for the formula)
|
||||
; added ID3v1 tag reading (except Genre field) by Alexei Ershov
|
||||
;--------------------------------------------------------------------------------------
|
||||
;0.5: SuperMP3 17/08/2005
|
||||
;0.5: SuperMP3 17/08/2005
|
||||
;Author: Sergey Kuzmin aka Wildwest <kuzmin_serg@list.ru>
|
||||
;Additions: Alexei Ershov aka ealex <e-al@yandex.ru>
|
||||
;Features: added checking of Padding bit;
|
||||
; Added open dialog and optimized macroses Text, Number, DrawLine by Alexei Ershov
|
||||
; Added open dialog and optimized macroses Text, Number, DrawLine by Alexei Ershov
|
||||
;--------------------------------------------------------------------------------------
|
||||
;0.4: SuperMP3 05/08/2005
|
||||
;0.4: SuperMP3 05/08/2005
|
||||
;Author: Sergey Kuzmin aka Wildwest <kuzmin_serg@list.ru>
|
||||
;Additions: Alexei Ershov aka ealex <e-al@yandex.ru>
|
||||
;Features: added Frame_size and Quantity_of_Frames;
|
||||
; optimized decode_samplerate and decode_bitrate routines by Alexei Ershov
|
||||
; optimized decode_samplerate and decode_bitrate routines by Alexei Ershov
|
||||
;--------------------------------------------------------------------------------------
|
||||
;0.3: SuperMP3 25/04/2005
|
||||
;Author: Sergey Kuzmin aka Wildwest <kuzmin_serg@list.ru>
|
||||
;0.3: SuperMP3 25/04/2005
|
||||
;Author: Sergey Kuzmin aka Wildwest <kuzmin_serg@list.ru>
|
||||
;Features: added File_size and Duration (rough estimation), improved SampleRate, fixed BitRate
|
||||
;--------------------------------------------------------------------------------------
|
||||
;0.2: SuperMP3 21/04/2005
|
||||
;Author: Sergey Kuzmin aka Wildwest <kuzmin_serg@list.ru>
|
||||
;--------------------------------------------------------------------------------------
|
||||
;0.2: SuperMP3 21/04/2005
|
||||
;Author: Sergey Kuzmin aka Wildwest <kuzmin_serg@list.ru>
|
||||
;Features: added SampleRate and BitRate
|
||||
;--------------------------------------------------------------------------------------
|
||||
;0.1: SuperMP3 20/04/2005
|
||||
;Author: Sergey Kuzmin aka Wildwest <kuzmin_serg@list.ru>
|
||||
;0.1: SuperMP3 20/04/2005
|
||||
;Author: Sergey Kuzmin aka Wildwest <kuzmin_serg@list.ru>
|
||||
;Features: able to detect MPEG Version, Layer, Channels
|
||||
;----------------------------------------------------------------------------------------
|
||||
;Issues:
|
||||
; MP3 player needs work of several men during several months(approx. 10 men and 2-4 months, because it is ASM OS).
|
||||
; If you want to listen a lot of mp3 in MenuetOS - make a bit of asm!
|
||||
;-----------------------------------------------------------------------------
|
||||
;CLEAN mp3 - is mp3 file without any info before header. Open mp3 in HEX EDITOR and check it out.
|
||||
;----------------------------------------------------------------------------------------
|
||||
;Issues:
|
||||
; MP3 player needs work of several men during several months(approx. 10 men and 2-4 months, because it is ASM OS).
|
||||
; If you want to listen a lot of mp3 in MenuetOS - make a bit of asm!
|
||||
;-----------------------------------------------------------------------------
|
||||
;CLEAN mp3 - is mp3 file without any info before header. Open mp3 in HEX EDITOR and check it out.
|
||||
|
||||
;Usually normal header's start looks like FFF3 or FFFB.
|
||||
|
||||
;If you see TAG (4944 3303 = ID3.) or RIFF (5249 4646 = RIFF)
|
||||
;or (0000 0000 - encoded by Lame codec or another shitty program) - it is bad,
|
||||
;If you see TAG (4944 3303 = ID3.) or RIFF (5249 4646 = RIFF)
|
||||
;or (0000 0000 - encoded by Lame codec or another program) - it is bad,
|
||||
;you must delete this piece until FFFx before testing. Happy testing!
|
||||
|
||||
;Note - I test it only on several files (test.mp3
|
||||
@ -82,16 +82,16 @@
|
||||
;For testing change name if the end of "supermp3.asm" - section
|
||||
fileinfo:
|
||||
dd 0, 0, 1, mp3_file, 0x1000
|
||||
db "/SYS/TEST.MP3",0
|
||||
db "/SYS/TEST.MP3",0
|
||||
|
||||
Package content:
|
||||
readme.txt - this file
|
||||
supermp3 - compiled exacutable file
|
||||
supermp3 - compiled executable file
|
||||
supermp3.asm - main file - build program's GUI
|
||||
MACROS.INC - standard file with macroses
|
||||
MOS_UZIT.INC - macroses for interface, routines for extracting bits and decoding extracted bits
|
||||
ASCL.INC - macroses for interface and useful stuff
|
||||
MACROS.INC - standard file with macros
|
||||
MOS_UZIT.INC - macros for interface, routines for extracting bits and decoding extracted bits
|
||||
ASCL.INC - macros for interface and useful stuff
|
||||
test.mp3 - test file
|
||||
|
||||
Any comments by e-mail or on forums (http://meos.sysbin.com, http://forum.meos.ru, http://menuetos.fastbb.ru,
|
||||
Any comments by e-mail or on forums (http://meos.sysbin.com, http://forum.meos.ru, http://menuetos.fastbb.ru,
|
||||
http://menuet.2.forumer.com, http://board.flatassembler.net/forum.php?f=12) are appreciated.
|
||||
@ -30,7 +30,7 @@
|
||||
#define IMG1_DISPLAY_H 256
|
||||
|
||||
const char WINDOW_TITLE[] = "QR Tool 0.2b";
|
||||
|
||||
|
||||
kolibri_system_colors sys_color_table;
|
||||
const color_t DRAWTEXT_FLAG_DEFAULT = 0x90000000;
|
||||
|
||||
@ -95,9 +95,9 @@ void redraw_window() {
|
||||
pos_t win_pos = get_mouse_pos(0);
|
||||
begin_draw();
|
||||
sys_create_window(win_pos.x, win_pos.y, WINDOW_WIDTH, WINDOW_HEIGHT, WINDOW_TITLE, sys_color_table.color_work_area, 0x14);
|
||||
|
||||
|
||||
//draw_text_sys("", /*x*/, /*y*/, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.work_text);
|
||||
|
||||
|
||||
define_button(X_W(WINDOW_COL2_X,100), Y_H(WINDOW_ROW1_Y,30), MYBTN_OPEN, sys_color_table.color_work_button);
|
||||
draw_text_sys("Open image", WINDOW_COL2_X + 12, WINDOW_ROW1_Y + 7, 0, DRAWTEXT_FLAG_DEFAULT | sys_color_table.color_work_button_text);
|
||||
|
||||
@ -121,13 +121,13 @@ void redraw_window() {
|
||||
void tedit1_print(const char *text, int text_len, int do_newline) {
|
||||
if (text_len == -1) { text_len = strlen(text); }
|
||||
ted_text_add(tedit1, (char *)text, text_len, 1);
|
||||
if (do_newline != 0 ) { ted_text_add(tedit1, "\r", 1, 1); }
|
||||
if (do_newline != 0 ) { ted_text_add(tedit1, "\r", 1, 1); }
|
||||
}
|
||||
|
||||
void create_components() {
|
||||
tedit1 = kolibri_new_editor(X_W(WINDOW_COL2_X, TEDIT1_W), Y_H(WINDOW_ROW1_Y + IMG1_DISPLAY_H - TEDIT1_H - 16, TEDIT1_H), 0/*0x11*/, TEDIT1_MAXCHAR, &tedit1_lock); // 0x11 font 8x16 sized x2, 0 - default (8x16)
|
||||
tedit1_lock = tedit1;
|
||||
tedit1->mode_invis = 0; /* dont show invisible characters */
|
||||
tedit1->mode_invis = 0; /* don't show invisible characters */
|
||||
|
||||
op_dialog1 = kolibri_new_open_dialog(OPEN, 10, 10, 420, 320);
|
||||
op_dialog1->dir_default_path = cur_dir_path;
|
||||
@ -191,7 +191,7 @@ void recognize_qr() {
|
||||
tedit1_print(data.payload, data.payload_len, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
puts("\nquirc_destroy()...\n");
|
||||
quirc_destroy(qr);
|
||||
}
|
||||
@ -203,7 +203,7 @@ void on_btn_open() {
|
||||
if (op_dialog1->status != 2 && op_dialog1->status != 0) {// fail or cancel
|
||||
img1_path = op_dialog1->openfile_path;
|
||||
//ted_text_add(tedit1, img1_path, strlen(img1_path), 1);
|
||||
//ted_text_add(tedit1, "\r", 1, 1); // newline
|
||||
//ted_text_add(tedit1, "\r", 1, 1); // newline
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
@ -211,35 +211,35 @@ void on_btn_open() {
|
||||
if (img1 != NULL) { img_destroy(img1); }
|
||||
if (img1_grayscale != NULL) { img_destroy(img1_grayscale); }
|
||||
uint32_t file_size;
|
||||
void *file_data = load_img(img1_path, &file_size); // Get RAW data and size
|
||||
void *file_data = load_img(img1_path, &file_size); // Get RAW data and size
|
||||
img1 = img_decode(file_data, file_size, 0); // Decode RAW data to Image data
|
||||
img1_grayscale = img_decode(file_data, file_size, 0); // Decode RAW data to Image data
|
||||
free(file_data); //
|
||||
printf("original: image->Width = %d, Image->Height = %d,\n original image type = %d\n\n", img1->Width, img1->Height, img1->Type);
|
||||
if (img1->Type != IMAGE_BPP24) {
|
||||
if (img1->Type != IMAGE_BPP24) {
|
||||
oldimg = img1; //
|
||||
img1 = img_convert(img1, NULL, IMAGE_BPP24, 0, 0); // Convert image to RGB 24
|
||||
img_destroy(oldimg); //
|
||||
if (!img1) {
|
||||
printf("Сonvert img1 to BPP24 error!: \n");
|
||||
printf("Сonvert img1 to BPP24 error!: \n");
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
if (img1_grayscale->Type != IMAGE_BPP24) {
|
||||
if (img1_grayscale->Type != IMAGE_BPP24) {
|
||||
oldimg = img1_grayscale; //
|
||||
img1_grayscale = img_convert(img1_grayscale, NULL, IMAGE_BPP24, 0, 0); // Convert image to RGB
|
||||
img_destroy(oldimg); //
|
||||
if (!img1_grayscale) {
|
||||
printf("Сonvert img1_grayscale to BPP24 error!: \n");
|
||||
printf("Сonvert img1_grayscale to BPP24 error!: \n");
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
if (img1_grayscale->Type != IMAGE_BPP8g) {
|
||||
if (img1_grayscale->Type != IMAGE_BPP8g) {
|
||||
oldimg = img1_grayscale; //
|
||||
img1_grayscale = img_convert(img1_grayscale, NULL, IMAGE_BPP8g, 0, 0); // Convert image to grayscale
|
||||
img_destroy(oldimg); //
|
||||
if (!img1_grayscale) {
|
||||
printf("Сonvert img1_grayscale to BPP8g error!: \n");
|
||||
printf("Сonvert img1_grayscale to BPP8g error!: \n");
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
@ -259,14 +259,14 @@ int main(int argc, char *argv[]) {
|
||||
((void)argc);
|
||||
strcpy(cur_dir_path, argv[0] + 2); char *pc = strrchr(cur_dir_path, '/'); if (pc) { *pc = '\0'; }
|
||||
printf("cur_dir_path = %s\n", cur_dir_path);
|
||||
|
||||
|
||||
kolibri_boxlib_init();
|
||||
kolibri_proclib_init(); // opensave && color dialogs
|
||||
kolibri_libimg_init();
|
||||
|
||||
set_wanted_events_mask(0xC0000027);
|
||||
set_os_keyb_mode(1); // scan code mode needed for editor
|
||||
|
||||
set_os_keyb_mode(1); // scan code mode needed for editor
|
||||
|
||||
kolibri_get_system_colors(&sys_color_table); // Get system colors theme
|
||||
|
||||
create_components();
|
||||
@ -281,7 +281,7 @@ int main(int argc, char *argv[]) {
|
||||
break;
|
||||
case KOLIBRI_EVENT_MOUSE:
|
||||
ted_mouse(tedit1);
|
||||
break;
|
||||
break;
|
||||
case KOLIBRI_EVENT_KEY:
|
||||
key = get_key();
|
||||
if (tedit1_lock == tedit1) { editor_key(tedit1, key); }
|
||||
@ -301,7 +301,7 @@ int main(int argc, char *argv[]) {
|
||||
ted_clear(tedit1, 1);
|
||||
redraw_window();
|
||||
break; */
|
||||
|
||||
|
||||
case MYBTN_QUIT:
|
||||
exit(0);
|
||||
break;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user