summaryrefslogtreecommitdiffstats
path: root/kscd/libwm/cdtext.c
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:49:11 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:49:11 -0600
commit83fbc82a101309e171089f0d5ed080f82a367345 (patch)
treec7b61083b6e2d4bfceaace9a7f018181ea36afec /kscd/libwm/cdtext.c
parentb248983f92b865ef74636ab5a673ae3a88f79c20 (diff)
downloadtdemultimedia-83fbc82a101309e171089f0d5ed080f82a367345.tar.gz
tdemultimedia-83fbc82a101309e171089f0d5ed080f82a367345.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kscd/libwm/cdtext.c')
-rw-r--r--kscd/libwm/cdtext.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/kscd/libwm/cdtext.c b/kscd/libwm/cdtext.c
index fafd039f..bb4e19b8 100644
--- a/kscd/libwm/cdtext.c
+++ b/kscd/libwm/cdtext.c
@@ -21,8 +21,8 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
-#ifdef libtqunicode
- #include <tqunicode.h>
+#ifdef libunicode
+ #include <unicode.h>
#endif
#include "include/wm_config.h"
@@ -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;