mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2026-01-11 23:25:57 +01:00
2014-08-14 Fred Gleason <fredg@paravelsystems.com>
* Fixed warnings in 'lib/rdaudioconvert.cpp'. * Fixed warnings in 'lib/rdaudioexport.cpp'. * Fixed warnings in 'lib/rdaudioimport.cpp'. * Fixed warnings in 'lib/rdcart_dialog.cpp'. * Fixed warnings in 'lib/rdconf.cpp'. * Fixed warnings in 'lib/rdcopyaudio.cpp'. * Fixed warnings in 'lib/rdescape_string.cpp'. * Fixed warnings in 'lib/rdevent_line.cpp'. * Fixed warnings in 'lib/rdfeed.cpp'. * Refactored 'RDOneShot' to use int values in 'lib/rdoneshot.cpp' and 'lib/rdoneshot.h'. * Fixed warnings in 'lib/rdpeaksexport.cpp'. * Fixed warnings in 'lib/rdtrimaudio.cpp'. * Fixed warnings in 'lib/rdwavefile.cpp'. * Fixed warnings in 'rdhpi/rdhpiplaystream.cpp'. * Fixed warnings in 'rdhpi/rdhpirecordstream.cpp'. * Fixed warnings in 'rdhpi/rdhpisoundcard.cpp'. * Fixed warnings in 'pam_rd/pam_rd.cpp'. * Fixed warnings in 'rdadmin/edit_rdairplay.cpp'. * Fixed warnings in 'rdairplay/list_log.cpp'. * Fixed warnings in 'rdairplay/log_play.cpp'. * Fixed warnings in 'rdairplay/pie_counter.cpp'. * Fixed warnings in 'rdairplay/rlm_host.cpp'. * Fixed warnings in 'rdcatchd/rdcatchd.cpp'. * Fixed warnings in 'rdlogedit/editlog.cpp'. * Fixed warnings in 'rdlogmanager/rdlogmanager.cpp'. * Fixed warnings in 'rdrepl/replfactory.h'. * Fixed warnings in 'ripcd/acu1p.cpp' and 'ripcd/acu1p.h'. * Fixed warnings in 'ripcd/bt16x2.cpp' and 'ripcd/bt16x2.h'. * Fixed warnings in 'ripcd/btss164.cpp' and 'ripcd/btss164.h'. * Fixed warnings in 'ripcd/btss42.cpp' and 'ripcd/btss42.h'. * Fixed warnings in 'ripcd/btss44.cpp' and 'ripcd/btss44.h'. * Fixed warnings in 'ripcd/btss82.cpp' and 'ripcd/btss82.h'. * Fixed warnings in 'ripcd/btsrc16.cpp' and 'ripcd/btsrc16.h'. * Fixed warnings in 'ripcd/btsrc8iii.cpp' and 'ripcd/btsrc8iii.h'. * Fixed warnings in 'ripcd/livewire_mcastgpio.cpp'. * Fixed warnings in 'ripcd/local_gpio.cpp' and 'ripcd/local_gpio.h'. * Fixed warnings in 'ripcd/sas64000gpi.cpp' and 'ripcd/sas64000gpi.h'. * Fixed warnings in 'ripcd/vguest.cpp' and 'ripcd/vguest.h'. * Fixed warnings in 'utils/rdhpiinfo/rdhpiinfo.cpp' * Fixed warnings in 'utils/rdgen/wavlib.cpp' * Fixed warnings in 'utils/rdimport/rdimport.cpp' * Fixed warnings in 'utils/rdsoftkeys/rdsoftkeys.cpp' * Fixed warnings in 'web/rdxport/export.cpp'
This commit is contained in:
@@ -273,12 +273,11 @@ int FixWav(int hFilename,unsigned dSamples,unsigned dBytes)
|
||||
int FindChunk(int hFilename,struct wavChunk *wavChunk)
|
||||
{
|
||||
int i;
|
||||
off_t oOffset;
|
||||
char sName[5]={0,0,0,0,0};
|
||||
unsigned char dBuffer[4];
|
||||
off_t oSize;
|
||||
|
||||
oOffset=lseek(hFilename,12,SEEK_SET);
|
||||
lseek(hFilename,12,SEEK_SET);
|
||||
i=read(hFilename,sName,4);
|
||||
i=read(hFilename,dBuffer,4);
|
||||
oSize=dBuffer[0]+(256*dBuffer[1])+(65536*dBuffer[2])+(16777216*dBuffer[3]);
|
||||
@@ -335,7 +334,7 @@ int GetListChunk(int hFilename,struct wavList *wavList)
|
||||
/*
|
||||
* Initialize Data Structures
|
||||
*/
|
||||
memset(wavList,0,sizeof(wavList));
|
||||
memset(wavList,0,sizeof(struct wavList));
|
||||
|
||||
/*
|
||||
* Find the list chunk
|
||||
|
||||
@@ -38,8 +38,6 @@
|
||||
MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
:QWidget(parent,name)
|
||||
{
|
||||
hpi_err_t hpi_err;
|
||||
|
||||
setCaption(tr("RDHPIInfo")+" v"+VERSION);
|
||||
|
||||
//
|
||||
@@ -78,7 +76,7 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
//
|
||||
// HPI Version
|
||||
//
|
||||
hpi_err=HPI_SubSysGetVersionEx(NULL,&hpi_version);
|
||||
HpiErr(HPI_SubSysGetVersionEx(NULL,&hpi_version),"HPI_SubSysGetVersionEx");
|
||||
QLabel *label=new QLabel(tr("HPI Version:"),this,"hpi_version_label");
|
||||
label->setGeometry(10,10,85,20);
|
||||
label->setFont(label_font);
|
||||
@@ -360,11 +358,12 @@ void MainWidget::changeModeData()
|
||||
void MainWidget::LoadAdapters()
|
||||
{
|
||||
int num_adapters;
|
||||
hpi_err_t hpi_err;
|
||||
|
||||
hpi_err=HPI_SubSysGetNumAdapters(NULL,&num_adapters);
|
||||
HpiErr(HPI_SubSysGetNumAdapters(NULL,&num_adapters),
|
||||
"HPI_SubSysGetNumAdapters");
|
||||
for(int i=0;i<num_adapters;i++) {
|
||||
hpi_err=HPI_SubSysGetAdapter(NULL,i,hpi_indexes+i,hpi_type+i);
|
||||
HpiErr(HPI_SubSysGetAdapter(NULL,i,hpi_indexes+i,hpi_type+i),
|
||||
"HPI_SubSysGetAdapter");
|
||||
hpi_ostreams[i]=0;
|
||||
hpi_istreams[i]=0;
|
||||
hpi_card_version[i]=0;
|
||||
|
||||
@@ -1196,10 +1196,9 @@ bool MainObject::FindChunk(int fd,const char *chunk_name,bool *fix_needed)
|
||||
int i;
|
||||
char name[5]={0,0,0,0,0};
|
||||
unsigned char buffer[4];
|
||||
off_t offset;
|
||||
unsigned chunk_size;
|
||||
|
||||
offset=lseek(fd,12,SEEK_SET);
|
||||
lseek(fd,12,SEEK_SET);
|
||||
i=read(fd,name,4);
|
||||
i=read(fd,buffer,4);
|
||||
chunk_size=buffer[0]+(256*buffer[1])+(65536*buffer[2])+(16777216*buffer[3]);
|
||||
@@ -1234,7 +1233,6 @@ bool MainObject::FixChunkSizes(const QString &filename)
|
||||
int i;
|
||||
char name[5]={0,0,0,0,0};
|
||||
unsigned char buffer[4];
|
||||
off_t offset;
|
||||
unsigned chunk_size;
|
||||
int fd;
|
||||
|
||||
@@ -1244,7 +1242,7 @@ bool MainObject::FixChunkSizes(const QString &filename)
|
||||
if((fd=open(filename,O_RDWR))<0) {
|
||||
return false;
|
||||
}
|
||||
offset=lseek(fd,12,SEEK_SET);
|
||||
lseek(fd,12,SEEK_SET);
|
||||
i=read(fd,name,4);
|
||||
i=read(fd,buffer,4);
|
||||
off_t last_offset=lseek(fd,0,SEEK_CUR);
|
||||
|
||||
@@ -177,15 +177,12 @@ MainWidget::MainWidget(QWidget *parent,const char *name)
|
||||
QSize MainWidget::sizeHint() const
|
||||
{
|
||||
unsigned x=0;
|
||||
unsigned y=0;
|
||||
|
||||
if(key_macros.size()>=key_columns) {
|
||||
x=10+90*key_columns;
|
||||
y=10+60*key_macros.size()/key_columns;
|
||||
}
|
||||
else {
|
||||
x=10+90*key_macros.size();
|
||||
y=70;
|
||||
}
|
||||
return QSize(x,key_ysize);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user