pull/1/head
Darrell Anderson 12 years ago
parent 447ec7dc0d
commit d2fc88a49d

@ -66,7 +66,7 @@ public:
/** /**
* As a convenience, since producing a length string from a number of second * As a convenience, since producing a length string from a number of second
* isn't a one liner, provide the lenght in string form. * isn't a one liner, provide the length in string form.
*/ */
TQString lengthString() const { return m_lengthString; } TQString lengthString() const { return m_lengthString; }
CacheDataStream &read(CacheDataStream &s); CacheDataStream &read(CacheDataStream &s);

@ -215,7 +215,7 @@ KSidPlugin::createValidator(const TQString& /*mimetype*/, const TQString& group,
const char* name) const const char* name) const
{ {
kdDebug(7034) << k_funcinfo << endl; kdDebug(7034) << k_funcinfo << endl;
// all items in "General" group are strings of max lenght 31 // all items in "General" group are strings of max length 31
if (group == "General") if (group == "General")
return new TQRegExpValidator(TQRegExp(".{,31}"), parent, name); return new TQRegExpValidator(TQRegExp(".{,31}"), parent, name);
// all others are read-only // all others are read-only

@ -77,10 +77,10 @@ struct cdtext_info {
#ifndef IGNORE_FEATURE_LIST #ifndef IGNORE_FEATURE_LIST
struct feature_list_header { struct feature_list_header {
unsigned char lenght_msb; unsigned char length_msb;
unsigned char lenght_1sb; unsigned char length_1sb;
unsigned char lenght_2sb; unsigned char length_2sb;
unsigned char lenght_lsb; unsigned char length_lsb;
unsigned char reserved1; unsigned char reserved1;
unsigned char reserved2; unsigned char reserved2;
unsigned char profile_msb; unsigned char profile_msb;
@ -91,7 +91,7 @@ struct feature_descriptor_cdread {
unsigned char feature_code_msb; unsigned char feature_code_msb;
unsigned char feature_code_lsb; unsigned char feature_code_lsb;
unsigned char settings; unsigned char settings;
unsigned char add_lenght; unsigned char add_length;
unsigned char add_settings; unsigned char add_settings;
unsigned char reserved1; unsigned char reserved1;
unsigned char reserved2; unsigned char reserved2;

@ -186,7 +186,7 @@ int gen_stop(struct wm_drive *d);
int gen_play(struct wm_drive *d, int start, int end, int realstart); int gen_play(struct wm_drive *d, int start, int end, int realstart);
int gen_eject(struct wm_drive *d); int gen_eject(struct wm_drive *d);
int gen_closetray(struct wm_drive *d); int gen_closetray(struct wm_drive *d);
int gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght); int gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length);
int find_drive_struct(const char *vendor, const char *model, const char *rev); int find_drive_struct(const char *vendor, const char *model, const char *rev);

@ -470,11 +470,11 @@ gen_get_volume(struct wm_drive *d,int *left,int *right)
} /* gen_get_volume() */ } /* gen_get_volume() */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
return -1; /* no SCSI, no CDTEXT */ return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */

@ -497,11 +497,11 @@ gen_get_volume(struct wm_drive *d, int *left, int *right)
} }
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
return -1; /* no SCSI, no CDTEXT */ return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */

@ -547,11 +547,11 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
} /* gen_get_volume() */ } /* gen_get_volume() */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
return -1; /* no SCSI, no CDTEXT */ return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */

@ -342,14 +342,14 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
} /* gen_get_volume() */ } /* gen_get_volume() */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
/* This needs to be tested ! */ /* This needs to be tested ! */
return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght); return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */

@ -460,11 +460,11 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
return -1; /* no SCSI, no CDTEXT */ return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */

@ -785,7 +785,7 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
} /* gen_get_volume() */ } /* gen_get_volume() */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
* *
* Return a buffer with cdtext-stream. buffer will be allocated and filled * Return a buffer with cdtext-stream. buffer will be allocated and filled
* *
@ -795,9 +795,9 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght); return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */
#endif /* __linux__ */ #endif /* __linux__ */

@ -430,11 +430,11 @@ gen_get_volume( struct wm_drive *d, omt *left, int *right)
} /* gen_get_volume() */ } /* gen_get_volume() */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
return -1; /* no SCSI, no CDTEXT */ return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */

@ -533,11 +533,11 @@ gen_get_volume(struct wm_drive *d, int *left, int *right)
} /* gen_get_volume() */ } /* gen_get_volume() */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
return -1; /* no SCSI, no CDTEXT */ return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */

@ -661,11 +661,11 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
} /* gen_get_volume() */ } /* gen_get_volume() */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
return -1; /* no SCSI, no CDTEXT */ return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */

@ -407,14 +407,14 @@ gen_get_volume(struct wm_drive *d, int *left, int *right)
} /* gen_get_volume() */ } /* gen_get_volume() */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
/* This needs to be tested! */ /* This needs to be tested! */
return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght); return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */

@ -959,14 +959,14 @@ codec_stop( void ) { return 0; }
#endif /* CODEC } */ #endif /* CODEC } */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
/* This needs to be tested */ /* This needs to be tested */
return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght); return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */
#endif /* sun */ #endif /* sun */

@ -469,14 +469,14 @@ gen_get_volume(struct wm_drive *d, int *left, int *right)
} /* gen_get_volume() */ } /* gen_get_volume() */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
/* This needs to be tested */ /* This needs to be tested */
return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght); return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */
#endif #endif

@ -281,15 +281,15 @@ gen_get_volume(struct wm_drive *d,int *left,int *right)
} /* gen_get_volume() */ } /* gen_get_volume() */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
* *
* For systems without working wm_scsi(), this should return -1 * For systems without working wm_scsi(), this should return -1
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght); return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */
#endif /* TEMPLATESYSTEM */ #endif /* TEMPLATESYSTEM */

@ -650,11 +650,11 @@ gen_get_volume(struct wm_drive *d, int *left, int *right)
} /* gen_get_volume() */ } /* gen_get_volume() */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* gen_get_cdtext(drive, buffer, lenght) * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
int int
gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght) gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{ {
return -1; /* No SCSI, no CDTEXT */ return -1; /* No SCSI, no CDTEXT */
} /* gen_get_cdtext() */ } /* gen_get_cdtext() */

@ -527,7 +527,7 @@ wm_scsi2_set_volume(struct wm_drive *d, int left, int right)
} }
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* wm_scsi_get_cdtext(drive, buffer, lenght) * wm_scsi_get_cdtext(drive, buffer, length)
* *
* Return a buffer with cdtext-stream. buffer mus be allocated and filled * Return a buffer with cdtext-stream. buffer mus be allocated and filled
* *
@ -587,11 +587,11 @@ wm_scsi_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_
if(!ret) if(!ret)
{ {
pHeader = (struct feature_list_header*)dynamic_temp; pHeader = (struct feature_list_header*)dynamic_temp;
/* printf("length = %i, profile = 0x%02X%02X\n", pHeader->lenght_lsb, pHeader->profile_msb, pHeader->profile_lsb);*/ /* printf("length = %i, profile = 0x%02X%02X\n", pHeader->length_lsb, pHeader->profile_msb, pHeader->profile_lsb);*/
pDescriptor = (struct feature_descriptor_cdread*)(dynamic_temp + sizeof(struct feature_list_header)); pDescriptor = (struct feature_descriptor_cdread*)(dynamic_temp + sizeof(struct feature_list_header));
/* printf("code = 0x%02X%02X, settings = 0x%02X, add_length = %i, add_settings = 0x%02X \n", /* printf("code = 0x%02X%02X, settings = 0x%02X, add_length = %i, add_settings = 0x%02X \n",
pDescriptor->feature_code_msb, pDescriptor->feature_code_lsb, pDescriptor->settings, pDescriptor->feature_code_msb, pDescriptor->feature_code_lsb, pDescriptor->settings,
pDescriptor->add_lenght, pDescriptor->add_settings);*/ pDescriptor->add_length, pDescriptor->add_settings);*/
cdtext_possible = pDescriptor->add_settings & 0x01; cdtext_possible = pDescriptor->add_settings & 0x01;
} }

@ -37,7 +37,7 @@ SplayPlugin::SplayPlugin() {
audioFrame=new AudioFrame(); audioFrame=new AudioFrame();
framer=new MpegAudioFrame(); framer=new MpegAudioFrame();
splay=new SplayDecoder(); splay=new SplayDecoder();
lenghtInSec=0; lengthInSec=0;
fileAccess=NULL; fileAccess=NULL;
info=NULL; info=NULL;
@ -106,7 +106,7 @@ void SplayPlugin::decoder_loop() {
framer->reset(); framer->reset();
lenghtInSec=0; lengthInSec=0;
resyncCounter=0; resyncCounter=0;
AudioFrame* audioFrame=pcmFrame; AudioFrame* audioFrame=pcmFrame;
@ -217,8 +217,8 @@ void SplayPlugin::processStreamState(TimeStamp* stamp,AudioFrame* playFrame){
audioSetup(playFrame); audioSetup(playFrame);
if (lnoLength==false) { if (lnoLength==false) {
lenghtInSec=getTotalLength(); lengthInSec=getTotalLength();
pluginInfo->setLength(lenghtInSec); pluginInfo->setLength(lengthInSec);
output->writeInfo(pluginInfo); output->writeInfo(pluginInfo);
} }

@ -42,7 +42,7 @@ class KDE_EXPORT SplayPlugin : public DecoderPlugin {
FloatFrame* floatFrame; FloatFrame* floatFrame;
PCMFrame* pcmFrame; PCMFrame* pcmFrame;
unsigned char* inputbuffer; unsigned char* inputbuffer;
int lenghtInSec; int lengthInSec;
MpegAudioInfo* info; MpegAudioInfo* info;
FileAccessWrapper* fileAccess; FileAccessWrapper* fileAccess;
int resyncCounter; int resyncCounter;

@ -452,7 +452,7 @@ class MpegSystemHeader {
int getPESPacketLen(); int getPESPacketLen();
void setPESPacketLen(int packetLen); void setPESPacketLen(int packetLen);
// rest lenght of TS packet. // rest length of TS packet.
int getTSPacketLen(); int getTSPacketLen();
void setTSPacketLen(int packetLen); void setTSPacketLen(int packetLen);

Loading…
Cancel
Save