diff options
Diffstat (limited to 'kscd')
| -rw-r--r-- | kscd/ChangeLog | 2 | ||||
| -rw-r--r-- | kscd/TODO | 2 | ||||
| -rw-r--r-- | kscd/kcompactdisc.h | 8 | ||||
| -rw-r--r-- | kscd/libwm/cdtext.c | 16 | ||||
| -rw-r--r-- | kscd/libwm/include/wm_cdtext.h | 2 | ||||
| -rw-r--r-- | kscd/panel.ui | 8 |
6 files changed, 19 insertions, 19 deletions
diff --git a/kscd/ChangeLog b/kscd/ChangeLog index ab561f86..3cb6493c 100644 --- a/kscd/ChangeLog +++ b/kscd/ChangeLog @@ -225,7 +225,7 @@ Fri May 15 18:28:40 1998 Bernd Johannes Wuebben <wuebben@math.cornell.edu> Tue Apr 14 05:17:36 1998 Bernd Johannes Wuebben <wuebben@math.cornell.edu> - * tqlayout corrections for kscd magic dialog + * layout corrections for kscd magic dialog Sat Jan 17 21:36:27 1998 Bernd Johannes Wuebben <wuebben@math.cornell.edu> @@ -6,4 +6,4 @@ AJS: o fix eject button o don't show "no disc" error on startup o direct digital playback -o better GUI tqlayout for LCD panel +o better GUI layout for LCD panel diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h index eeb17989..8015ab27 100644 --- a/kscd/kcompactdisc.h +++ b/kscd/kcompactdisc.h @@ -34,7 +34,7 @@ * @see #discChanged(): A disc was inserted or removed. * @see #trayOpening(): A disc is being removed. * - * The progress of ptqlayout is modelled by these signals: + * The progress of playout is modelled by these signals: * * @see #trackPlaying(): A track started playing, or is still playing. * @see #trackPaused(): A track was paused. @@ -64,12 +64,12 @@ public: void eject(); /** - * Start ptqlayout at given position of track. + * Start playout at given position of track. */ void play(unsigned startTrack = 0, unsigned startTrackPosition = 0, unsigned endTrack = 0); /** - * Pause/resume ptqlayout. + * Pause/resume playout. */ void pause(); @@ -96,7 +96,7 @@ public: void setVolume(unsigned volume); /** - * Stop ptqlayout. + * Stop playout. */ void stop(); 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; diff --git a/kscd/panel.ui b/kscd/panel.ui index ab9203ec..2ef615ef 100644 --- a/kscd/panel.ui +++ b/kscd/panel.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -40,7 +40,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -128,7 +128,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -203,7 +203,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> |