diff options
Diffstat (limited to 'kscd/libwm')
| -rw-r--r-- | kscd/libwm/cdtext.c | 16 | ||||
| -rw-r--r-- | kscd/libwm/include/wm_cdtext.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kscd/libwm/cdtext.c b/kscd/libwm/cdtext.c index fafd039f..89671aa6 100644 --- a/kscd/libwm/cdtext.c +++ b/kscd/libwm/cdtext.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifdef libtqunicode +#ifdef libunicode #include <tqunicode.h> #endif @@ -155,12 +155,12 @@ void get_data_from_cdtext_pack( int arr = pack->header_field_id2_tracknumber; int i; int language_block; - int tqunicode; + int unicode; language_block = (pack->header_field_id4_block_no >> 4) & 0x07; - tqunicode = pack->header_field_id4_block_no & 0x80; + unicode = pack->header_field_id4_block_no & 0x80; - if(!tqunicode) + if(!unicode) { for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i++) { @@ -180,7 +180,7 @@ void get_data_from_cdtext_pack( } } } -#ifdef libtqunicode +#ifdef libunicode else /* doublebytes ;-) */ { for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i += 2) @@ -203,7 +203,7 @@ void get_data_from_cdtext_pack( } #else else { - wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle tqunicode"); + wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle unicode"); } #endif } @@ -315,9 +315,9 @@ get_glob_cdtext(struct wm_drive *d, int redo) { wm_cdtext_info.blocks[j] = lp_block; wm_cdtext_info.blocks[j]->block_code = code; - wm_cdtext_info.blocks[j]->block_tqunicode = pack->header_field_id4_block_no & 0x80; + wm_cdtext_info.blocks[j]->block_unicode = pack->header_field_id4_block_no & 0x80; wm_lib_message(WM_MSG_LEVEL_DEBUG | WM_MSG_CLASS, - "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_tqunicode?"doublebyte":"singlebyte"); + "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_unicode?"doublebyte":"singlebyte"); /* unsigned char block_encoding; not jet! cdtext_string* block_encoding_text; diff --git a/kscd/libwm/include/wm_cdtext.h b/kscd/libwm/include/wm_cdtext.h index ba481be0..e843ee95 100644 --- a/kscd/libwm/include/wm_cdtext.h +++ b/kscd/libwm/include/wm_cdtext.h @@ -44,7 +44,7 @@ typedef unsigned char cdtext_string[MAX_LENGHT_OF_CDTEXT_STRING]; struct cdtext_info_block { /* management */ unsigned char block_code; - unsigned char block_tqunicode; /* 0 - single chars, 1 - doublebytes */ + unsigned char block_unicode; /* 0 - single chars, 1 - doublebytes */ unsigned char block_encoding; /* orange book -? */ cdtext_string* block_encoding_text; |