diff --git a/ChangeLog b/ChangeLog index 3da7576f..1b94607d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14309,3 +14309,48 @@ * Added a 'maintainer-clean-local' target in 'Makefile.am'. 2014-08-14 Fred Gleason * Refactored the AM_INIT() invocation in 'configure.ac'. +2014-08-14 Fred Gleason + * 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' diff --git a/lib/rdaudioconvert.cpp b/lib/rdaudioconvert.cpp index afdb9c1e..16852ccc 100644 --- a/lib/rdaudioconvert.cpp +++ b/lib/rdaudioconvert.cpp @@ -309,6 +309,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage1Convert(const QString &srcfile, delete wave; return err; + case RDWaveFile::Aiff: case RDWaveFile::Unknown: break; } @@ -1378,7 +1379,6 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer2Wav(SNDFILE *src_sf, const QString &dstfile) { #ifdef HAVE_TWOLAME - short *sf_buffer=NULL; sf_count_t n; ssize_t s; RDWaveFile *wave=NULL; @@ -1432,7 +1432,6 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer2Wav(SNDFILE *src_sf, wave->setMextChunk(true); wave->setCartChunk(conv_dst_wavedata!=NULL); wave->setLevlChunk(true); - sf_buffer=new int16_t[2048*src_sf_info->channels]; unlink(dstfile); if(!wave->createWave(conv_dst_wavedata)) { return RDAudioConvert::ErrorNoDestination; diff --git a/lib/rdaudioexport.cpp b/lib/rdaudioexport.cpp index 41e59e6a..e1535292 100644 --- a/lib/rdaudioexport.cpp +++ b/lib/rdaudioexport.cpp @@ -176,6 +176,7 @@ RDAudioExport::ErrorCode RDAudioExport::runExport(const QString &username, case CURLE_OUT_OF_MEMORY: case CURLE_OPERATION_TIMEDOUT: case CURLE_HTTP_POST_ERROR: + default: curl_easy_cleanup(curl); return RDAudioExport::ErrorInternal; diff --git a/lib/rdaudioimport.cpp b/lib/rdaudioimport.cpp index 11911936..d6959780 100644 --- a/lib/rdaudioimport.cpp +++ b/lib/rdaudioimport.cpp @@ -206,6 +206,7 @@ RDAudioImport::ErrorCode RDAudioImport::runImport(const QString &username, case CURLE_OPERATION_TIMEDOUT: case CURLE_HTTP_POST_ERROR: curl_easy_cleanup(curl); + default: return RDAudioImport::ErrorInternal; case CURLE_URL_MALFORMAT: diff --git a/lib/rdcart_dialog.cpp b/lib/rdcart_dialog.cpp index ba74e465..b803da45 100644 --- a/lib/rdcart_dialog.cpp +++ b/lib/rdcart_dialog.cpp @@ -719,7 +719,6 @@ void RDCartDialog::RefreshCarts() QString sql; RDSqlQuery *q; RDListViewItem *l; - RDListViewItem *active_item=NULL; cart_cart_list->clear(); QString group=cart_group_box->currentText(); @@ -797,9 +796,6 @@ void RDCartDialog::RefreshCarts() else { l->setText(12,"TFN"); } - if(*cart_cartnum==q->value(0).toInt()) { - active_item=l; - } if(count++>RDCART_DIALOG_STEP_SIZE) { cart_progress_dialog->setProgress(++step); count=0; diff --git a/lib/rdconf.cpp b/lib/rdconf.cpp index 80f6030a..56286584 100644 --- a/lib/rdconf.cpp +++ b/lib/rdconf.cpp @@ -736,7 +736,6 @@ int RDSetTimeLength(const QString &str) int istate=2; QString field; int res=0; - bool decimalpt=false; if(str.isEmpty()) { return -1; @@ -771,9 +770,6 @@ int RDSetTimeLength(const QString &str) res+=1000*field.toInt(); break; } - if(str.at(i)=='.') { - decimalpt=true; - } istate++; field=""; } diff --git a/lib/rdcopyaudio.cpp b/lib/rdcopyaudio.cpp index 9f0ce7c2..50784420 100644 --- a/lib/rdcopyaudio.cpp +++ b/lib/rdcopyaudio.cpp @@ -119,6 +119,7 @@ RDCopyAudio::ErrorCode RDCopyAudio::runCopy(const QString &username, case CURLE_OUT_OF_MEMORY: case CURLE_OPERATION_TIMEDOUT: case CURLE_HTTP_POST_ERROR: + default: curl_easy_cleanup(curl); return RDCopyAudio::ErrorInternal; diff --git a/lib/rdescape_string.cpp b/lib/rdescape_string.cpp index 2262bf04..afb0fdc1 100644 --- a/lib/rdescape_string.cpp +++ b/lib/rdescape_string.cpp @@ -46,10 +46,6 @@ QString RDEscapeString(QString const &str) res+=QString("\\\""); break; - case '´': - res+=QString("\\´"); - break; - case '`': res+=QString("\\`"); break; diff --git a/lib/rdevent_line.cpp b/lib/rdevent_line.cpp index 9ad29e6f..40ddae7c 100644 --- a/lib/rdevent_line.cpp +++ b/lib/rdevent_line.cpp @@ -448,7 +448,6 @@ bool RDEventLine::generateLog(QString logname,const QString &svcname, RDSqlQuery *q; RDSqlQuery *q1; QTime time=event_start_time; - QTime end_time=event_start_time.addMSecs(event_length); QTime fill_start_time; int count=0; logname.replace(" ","_"); diff --git a/lib/rdfeed.cpp b/lib/rdfeed.cpp index 86f5b727..6976a228 100644 --- a/lib/rdfeed.cpp +++ b/lib/rdfeed.cpp @@ -798,8 +798,6 @@ unsigned RDFeed::CreateCast(QString *filename,int bytes,int msecs) const RDSqlQuery *q; RDSqlQuery *q1; unsigned cast_id=0; - QDateTime current_datetime= - QDateTime(QDate::currentDate(),QTime::currentTime()); sql=QString().sprintf("select CHANNEL_TITLE,CHANNEL_DESCRIPTION,\ CHANNEL_CATEGORY,CHANNEL_LINK,MAX_SHELF_LIFE,\ diff --git a/lib/rdoneshot.cpp b/lib/rdoneshot.cpp index 601a0a9f..63b9a239 100644 --- a/lib/rdoneshot.cpp +++ b/lib/rdoneshot.cpp @@ -4,8 +4,6 @@ // // (C) Copyright 2008 Fred Gleason // -// $Id: rdoneshot.cpp,v 1.3 2010/07/29 19:32:33 cvs Exp $ -// // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as // published by the Free Software Foundation. @@ -40,9 +38,9 @@ RDOneShot::RDOneShot(QObject *parent,const char *name) } -void RDOneShot::start(void *data,int msecs) +void RDOneShot::start(int value,int msecs) { - shot_pointers[shot_count]=data; + shot_values[shot_count]=value; shot_timers[shot_count]=new QTimer(this); shot_mapper->setMapping(shot_timers[shot_count],shot_count); connect(shot_timers[shot_count],SIGNAL(timeout()), @@ -54,7 +52,7 @@ void RDOneShot::start(void *data,int msecs) void RDOneShot::timeoutData(int id) { - emit timeout(shot_pointers[id]); + emit timeout(shot_values[id]); shot_zombie_timer->start(10,true); } @@ -64,7 +62,7 @@ void RDOneShot::zombieData() for(std::map::iterator it=shot_timers.begin(); it!=shot_timers.end();it++) { if(!it->second->isActive()) { - shot_pointers.erase(it->first); + shot_values.erase(it->first); delete it->second; shot_timers.erase(it); } diff --git a/lib/rdoneshot.h b/lib/rdoneshot.h index ff258daa..83e242a4 100644 --- a/lib/rdoneshot.h +++ b/lib/rdoneshot.h @@ -34,10 +34,10 @@ class RDOneShot : public QObject Q_OBJECT public: RDOneShot(QObject *parent=0,const char *name=0); - void start(void *data,int msecs); + void start(int value,int msecs); signals: - void timeout(void *data); + void timeout(int value); private slots: void timeoutData(int id); @@ -45,7 +45,7 @@ class RDOneShot : public QObject private: std::map shot_timers; - std::map shot_pointers; + std::map shot_values; QSignalMapper *shot_mapper; QTimer *shot_zombie_timer; int shot_count; diff --git a/lib/rdpeaksexport.cpp b/lib/rdpeaksexport.cpp index 91e26acb..49a562bc 100644 --- a/lib/rdpeaksexport.cpp +++ b/lib/rdpeaksexport.cpp @@ -144,6 +144,7 @@ RDPeaksExport::ErrorCode RDPeaksExport::runExport(const QString &username, case CURLE_OUT_OF_MEMORY: case CURLE_OPERATION_TIMEDOUT: case CURLE_HTTP_POST_ERROR: + default: curl_easy_cleanup(curl); return RDPeaksExport::ErrorInternal; diff --git a/lib/rdtrimaudio.cpp b/lib/rdtrimaudio.cpp index 4c4a9e40..c6b9222c 100644 --- a/lib/rdtrimaudio.cpp +++ b/lib/rdtrimaudio.cpp @@ -138,6 +138,7 @@ RDTrimAudio::ErrorCode RDTrimAudio::runTrim(const QString &username, case CURLE_OUT_OF_MEMORY: case CURLE_OPERATION_TIMEDOUT: case CURLE_HTTP_POST_ERROR: + default: //fprintf(stderr,"CURL Error: %s [%d]\n",curl_easy_strerror(curl_err), //curl_err); curl_easy_cleanup(curl); diff --git a/lib/rdwavefile.cpp b/lib/rdwavefile.cpp index fc6414ea..f6b8cda4 100644 --- a/lib/rdwavefile.cpp +++ b/lib/rdwavefile.cpp @@ -927,7 +927,7 @@ int RDWaveFile::readWave(void *buf,int count) if ( c <0 ) return 0; // read error // Fixup the buffer for big endian hosts (Wav is defined as LE). if (htonl (1l) == 1){ // Big endian host - for (unsigned int i = 0; i < c/2; i++){ + for(int i = 0; i < c/2; i++){ ((short*)buf)[i] = ReadSword((unsigned char *)buf,2*i); } } @@ -1000,7 +1000,7 @@ int RDWaveFile::writeWave(void *buf,int count) data_length+=count; // Fixup the buffer for big endian hosts (Wav is defined as LE). if (htonl (1l) == 1l){ // Big endian host - for (unsigned int i = 0; i < count/2; i++){ + for(int i = 0; i < count/2; i++) { unsigned short s = ((unsigned short*)buf)[i]; WriteSword((unsigned char *)buf,2*i,s); } @@ -1134,6 +1134,7 @@ void RDWaveFile::getSettings(RDSettings *settings) { switch(type()) { case RDWaveFile::Pcm8: + case RDWaveFile::Aiff: // FIXME break; @@ -1180,6 +1181,7 @@ void RDWaveFile::setSettings(const RDSettings *settings) int RDWaveFile::seekWave(int offset,int whence) { int pos; + unsigned abspos; switch(wave_type) { case RDWaveFile::Ogg: @@ -1209,35 +1211,44 @@ int RDWaveFile::seekWave(int offset,int whence) return -1; break; - case RDWaveFile::Wave:// FIXME: how fix comparing singed (data_start, offset, pos) vs. unsigned (data_length) ... WAVE standard is 32 bit, but not sure if signed or not... grauf@rfa.org Tue, 04 Apr 2006 21:02:51 -0400 + case RDWaveFile::Wave: switch(whence) { case SEEK_SET: - if (offset<0) { + if(offset<0) { offset=0; } - if (offset>data_length) { + if((unsigned)offset>data_length) { offset=data_length; } return lseek(wave_file.handle(), offset+data_start,SEEK_SET)-data_start; break; + case SEEK_CUR: pos = lseek(wave_file.handle(),0,SEEK_CUR); - if ((pos+offset)(data_start+data_length)) { - offset=offset - ((pos+offset) - (data_start+data_length)); + if (abspos>(data_start+data_length)) { + offset=offset - (abspos - (data_start+data_length)); } return lseek(wave_file.handle(),offset,SEEK_CUR)-data_start; break; case SEEK_END: pos = lseek(wave_file.handle(),0,SEEK_END); - if ((pos+offset)(data_start+data_length)) { - offset=offset - ((pos+offset) - (data_start+data_length)); + if (abspos>(data_start+data_length)) { + offset=offset - (abspos - (data_start+data_length)); } return lseek(wave_file.handle(),offset,SEEK_END)-data_start; break; @@ -2201,15 +2212,14 @@ bool RDWaveFile::IsAiff(int fd) } -off_t RDWaveFile::FindChunk(int fd,char *chunk_name,unsigned *chunk_size, +off_t RDWaveFile::FindChunk(int fd,const char *chunk_name,unsigned *chunk_size, bool big_end) { int i; char name[5]={0,0,0,0,0}; unsigned char buffer[4]; - off_t offset; - offset=lseek(fd,12,SEEK_SET); + lseek(fd,12,SEEK_SET); i=read(fd,name,4); i=read(fd,buffer,4); if(big_end) { @@ -2240,7 +2250,7 @@ off_t RDWaveFile::FindChunk(int fd,char *chunk_name,unsigned *chunk_size, } -bool RDWaveFile::GetChunk(int fd,char *chunk_name,unsigned *chunk_size, +bool RDWaveFile::GetChunk(int fd,const char *chunk_name,unsigned *chunk_size, unsigned char *chunk,size_t size,bool big_end) { off_t pos; @@ -2253,8 +2263,8 @@ bool RDWaveFile::GetChunk(int fd,char *chunk_name,unsigned *chunk_size, } -void RDWaveFile::WriteChunk(int fd,char *cname,unsigned char *buf,unsigned size, - bool big_end) +void RDWaveFile::WriteChunk(int fd,const char *cname,unsigned char *buf, + unsigned size,bool big_end) { unsigned char size_buf[4]; unsigned csize; @@ -2620,11 +2630,9 @@ bool RDWaveFile::GetScot(int fd) unsigned chunk_size; int start_day; int start_month; - int start_year; int start_hour; int end_day; int end_month; - int end_year; int end_hour; unsigned cartnum; unsigned segue_start; @@ -2641,7 +2649,7 @@ bool RDWaveFile::GetScot(int fd) scot_etc=cutString((char *)scot_chunk_data,301,33); scot_year=cutString((char *)scot_chunk_data,338,4).toInt(); scot_intro_length=cutString((char *)scot_chunk_data,335,2).toInt()*1000; - start_year=cutString((char *)scot_chunk_data,69,2).toInt()+2000; + //start_year=cutString((char *)scot_chunk_data,69,2).toInt()+2000; start_month=cutString((char *)scot_chunk_data,65,2).toInt(); start_day=cutString((char *)scot_chunk_data,67,2).toInt(); cartnum=cutString((char *)scot_chunk_data,47,4).toUInt(); @@ -2653,7 +2661,7 @@ bool RDWaveFile::GetScot(int fd) if((start_hour>=129)&&(start_hour<=151)) { scot_start_time=QTime(start_hour-128,0,0); } - end_year=cutString((char *)scot_chunk_data,75,2).toInt()+2000; + //end_year=cutString((char *)scot_chunk_data,75,2).toInt()+2000; end_month=cutString((char *)scot_chunk_data,71,2).toInt(); end_day=cutString((char *)scot_chunk_data,73,2).toInt(); if((end_month>0)&&(end_month<13)&&(end_day>0)&&(end_day<32)&& @@ -2725,7 +2733,7 @@ bool RDWaveFile::GetAv10(int fd) // // Walk through the fields // - for(int i=2;idata.vorbis_comment.num_comments; + for(unsigned iCommentIndex=0; + iCommentIndexdata.vorbis_comment.num_comments; ++iCommentIndex) { FLAC__StreamMetadata_VorbisComment_Entry& @@ -4207,8 +4215,6 @@ unsigned RDWaveFile::LoadEnergy() int offset; unsigned energy_size; - short max=0; - energy_data.clear(); energy_size=getSampleLength()*getChannels()/1152; @@ -4248,7 +4254,6 @@ unsigned RDWaveFile::LoadEnergy() return i; } for(int j=0;jsetGeometry(805,532,sizeHint().width()-815,55); - QRadioButton *rbutton= - new QRadioButton(tr("None"),air_bar_group); - rbutton=new QRadioButton(tr("Start Next"),air_bar_group); + new QRadioButton(tr("None"),air_bar_group); + new QRadioButton(tr("Start Next"),air_bar_group); // // Start/Stop Section diff --git a/rdairplay/list_log.cpp b/rdairplay/list_log.cpp index 56670675..b5edbe47 100644 --- a/rdairplay/list_log.cpp +++ b/rdairplay/list_log.cpp @@ -1054,12 +1054,10 @@ void ListLog::selectionChangedData() void ListLog::transportChangedData() { - int count=0; int transport_line[TRANSPORT_QUANTITY]; SetColor(); - count=0; list_log->transportEvents(transport_line); for(int i=0;i0) { @@ -2094,7 +2092,6 @@ void LogPlay::UpdateStartTimes(int line) if((logline=logLine(i))!=NULL) { if((next_logline=logLine(nextLine(i)))!=NULL) { next_trans=next_logline->transType(); - next_length=next_logline->segueLength(next_trans); } else { next_trans=RDLogLine::Stop; @@ -2104,7 +2101,6 @@ void LogPlay::UpdateStartTimes(int line) case RDLogLine::Playing: case RDLogLine::Finishing: time=logline->startTime(RDLogLine::Actual); - playing=true; break; default: diff --git a/rdairplay/pie_counter.cpp b/rdairplay/pie_counter.cpp index 9df5f441..6a85ecff 100644 --- a/rdairplay/pie_counter.cpp +++ b/rdairplay/pie_counter.cpp @@ -299,8 +299,8 @@ void PieCounter::paintEvent(QPaintEvent *e) p->setPen(pie_color); p->drawPie(ring,ring,PIE_COUNTER_SIZE,PIE_COUNTER_SIZE,1440+angle,5760-angle); if(((pie_time0))|| - (((750+pie_talk_end-pie_pos)/1000)<100)&& - ((pie_pos>=pie_talk_start)&&(pie_pos<=pie_talk_end))) { + ((((750+pie_talk_end-pie_pos)/1000)<100)&& + ((pie_pos>=pie_talk_start)&&(pie_pos<=pie_talk_end)))) { p->setBrush(backgroundColor()); p->setPen(backgroundColor()); p->drawPie(ring+20,ring+20,PIE_COUNTER_SIZE-40,PIE_COUNTER_SIZE-40,0,5760); diff --git a/rdairplay/rlmhost.cpp b/rdairplay/rlmhost.cpp index b76c8f9d..b289cabe 100644 --- a/rdairplay/rlmhost.cpp +++ b/rdairplay/rlmhost.cpp @@ -86,7 +86,7 @@ void RLMHost::sendEvent(const QString &svcname,const QString &logname, struct rlm_log *log=new struct rlm_log; struct rlm_pad *now=new struct rlm_pad; struct rlm_pad *next=new struct rlm_pad; - memset(svc,0,sizeof(svc)); + memset(svc,0,sizeof(struct rlm_svc)); RDSvc *service=new RDSvc(svcname); if(!svcname.isEmpty()) { sprintf(svc->svc_name,"%s",(const char *)svcname.left(255)); @@ -102,7 +102,7 @@ void RLMHost::sendEvent(const QString &svcname,const QString &logname, svc->svc_pgmcode[0]=0; } delete service; - memset(log,0,sizeof(log)); + memset(log,0,sizeof(struct rlm_log)); if(!logname.isEmpty()) { sprintf(log->log_name,"%s",(const char *)logname.left(64)); } diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index 385e7c84..72698a4b 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -162,17 +162,17 @@ MainObject::MainObject(QObject *parent,const char *name) // Initialize Data Structures // debug=false; - for(int i=0;igetCardOutputStreams(card_number);i++) { - if((hpi_error=HPI_OutStreamOpen(NULL,card_index[card_number],i, - &hostream))==0) { + if(HPI_OutStreamOpen(NULL,card_index[card_number],i,&hostream)==0) { found=true; break; } @@ -192,30 +190,30 @@ bool RDHPIPlayStream::formatSupported(RDWaveFile::Format format) } switch(format) { case RDWaveFile::Pcm16: - hpi_error=HPI_FormatCreate(&hpi_format,getChannels(), - HPI_FORMAT_PCM16_SIGNED, - getSamplesPerSec(),getHeadBitRate(),0); + LogHpi(HPI_FormatCreate(&hpi_format,getChannels(), + HPI_FORMAT_PCM16_SIGNED, + getSamplesPerSec(),getHeadBitRate(),0)); state=HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format); break; case RDWaveFile::MpegL1: - hpi_error=HPI_FormatCreate(&hpi_format,getChannels(), - HPI_FORMAT_MPEG_L1, - getSamplesPerSec(),getHeadBitRate(),0); + LogHpi(HPI_FormatCreate(&hpi_format,getChannels(), + HPI_FORMAT_MPEG_L1, + getSamplesPerSec(),getHeadBitRate(),0)); state=HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format); break; case RDWaveFile::MpegL2: - hpi_error=HPI_FormatCreate(&hpi_format,getChannels(), - HPI_FORMAT_MPEG_L2, - getSamplesPerSec(),getHeadBitRate(),0); + LogHpi(HPI_FormatCreate(&hpi_format,getChannels(), + HPI_FORMAT_MPEG_L2, + getSamplesPerSec(),getHeadBitRate(),0)); state=HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format); break;; case RDWaveFile::MpegL3: - hpi_error=HPI_FormatCreate(&hpi_format,getChannels(), - HPI_FORMAT_MPEG_L3, - getSamplesPerSec(),getHeadBitRate(),0); + LogHpi(HPI_FormatCreate(&hpi_format,getChannels(), + HPI_FORMAT_MPEG_L3, + getSamplesPerSec(),getHeadBitRate(),0)); state=HPI_OutStreamQueryFormat(NULL,hostream,&hpi_format); break; @@ -224,7 +222,7 @@ bool RDHPIPlayStream::formatSupported(RDWaveFile::Format format) break; } if(!is_open) { - hpi_error=HPI_OutStreamClose(NULL,hostream); + LogHpi(HPI_OutStreamClose(NULL,hostream)); } if(state!=0) { return false; @@ -385,15 +383,14 @@ bool RDHPIPlayStream::play() #ifdef RPLAYSTREAM_SHOW_SLOTS printf("play() -- Card: %d Stream: %d\n",card_number,stream_number); #endif // RPLAYSTREAM_SHOW_SLOTS - hpi_err_t hpi_error; syslog(LOG_ERR,"Play - 1\n"); if(!is_open) { return false; } if((!playing)&&(!is_paused)) { - hpi_error=HPI_OutStreamSetTimeScale(NULL,hpi_stream, + LogHpi(HPI_OutStreamSetTimeScale(NULL,hpi_stream, (uint16_t)((RD_TIMESCALE_DIVISOR/(double)play_speed)* - HPI_OSTREAM_TIMESCALE_UNITS)); + HPI_OSTREAM_TIMESCALE_UNITS))); if(HPI_OutStreamGetInfoEx(NULL,hpi_stream, &state,&buffer_size,&data_to_play, &samples_played,&reserved)!=0) { @@ -415,22 +412,22 @@ bool RDHPIPlayStream::play() case WAVE_FORMAT_VORBIS: switch(getBitsPerSample()) { case 8: - hpi_error=HPI_FormatCreate(&format,getChannels(), - HPI_FORMAT_PCM8_UNSIGNED,getSamplesPerSec(), - 0,0); + LogHpi(HPI_FormatCreate(&format,getChannels(), + HPI_FORMAT_PCM8_UNSIGNED, + getSamplesPerSec(),0,0)); break; case 16: - hpi_error=HPI_FormatCreate(&format,getChannels(), - HPI_FORMAT_PCM16_SIGNED,getSamplesPerSec(), - 0,0); + LogHpi(HPI_FormatCreate(&format,getChannels(), + HPI_FORMAT_PCM16_SIGNED, + getSamplesPerSec(),0,0)); break; case 32: - hpi_error=HPI_FormatCreate(&format,getChannels(), - HPI_FORMAT_PCM32_SIGNED,getSamplesPerSec(), - 0,0); + LogHpi(HPI_FormatCreate(&format,getChannels(), + HPI_FORMAT_PCM32_SIGNED, + getSamplesPerSec(),0,0)); break; default: - hpi_error=HPI_AdapterClose(NULL,card_index[card_number]); + LogHpi(HPI_AdapterClose(NULL,card_index[card_number])); return false; break; } @@ -438,22 +435,22 @@ bool RDHPIPlayStream::play() case WAVE_FORMAT_MPEG: switch(getHeadLayer()) { case 1: - hpi_error=HPI_FormatCreate(&format,getChannels(), - HPI_FORMAT_MPEG_L1,getSamplesPerSec(), - getHeadBitRate(),getHeadFlags()); + LogHpi(HPI_FormatCreate(&format,getChannels(), + HPI_FORMAT_MPEG_L1,getSamplesPerSec(), + getHeadBitRate(),getHeadFlags())); break; case 2: - hpi_error=HPI_FormatCreate(&format,getChannels(), - HPI_FORMAT_MPEG_L2,getSamplesPerSec(), - getHeadBitRate(),getHeadFlags()); + LogHpi(HPI_FormatCreate(&format,getChannels(), + HPI_FORMAT_MPEG_L2,getSamplesPerSec(), + getHeadBitRate(),getHeadFlags())); break; case 3: - hpi_error=HPI_FormatCreate(&format,getChannels(), - HPI_FORMAT_MPEG_L3,getSamplesPerSec(), - getHeadBitRate(),getHeadFlags()); + LogHpi(HPI_FormatCreate(&format,getChannels(), + HPI_FORMAT_MPEG_L3,getSamplesPerSec(), + getHeadBitRate(),getHeadFlags())); break; default: - hpi_error=HPI_AdapterClose(NULL,card_index[card_number]); + LogHpi(HPI_AdapterClose(NULL,card_index[card_number])); return false; } break; @@ -480,11 +477,10 @@ bool RDHPIPlayStream::play() } readWave(pdata,read_bytes); #if HPI_VER > 0x00030500 - hpi_error= - HPI_OutStreamWriteBuf(NULL,hpi_stream,pdata,read_bytes,&format); + LogHpi(HPI_OutStreamWriteBuf(NULL,hpi_stream,pdata,read_bytes,&format)); #else - hpi_error=HPI_DataCreate(&hpi_data,&format,pdata,read_bytes); - hpi_error=HPI_OutStreamWrite(NULL,hpi_stream,&hpi_data); + LogHpi(HPI_DataCreate(&hpi_data,&format,pdata,read_bytes)); + LogHpi(HPI_OutStreamWrite(NULL,hpi_stream,&hpi_data)); #endif if(HPI_OutStreamStart(NULL,hpi_stream)!=0) { return false; @@ -506,7 +502,7 @@ bool RDHPIPlayStream::play() } } if((!playing)&(is_paused|repositioned)) { - hpi_error=HPI_OutStreamStart(NULL,hpi_stream); + LogHpi(HPI_OutStreamStart(NULL,hpi_stream)); clock->start(FRAGMENT_TIME); playing=true; stopping=false; @@ -527,7 +523,6 @@ void RDHPIPlayStream::pause() #ifdef RPLAYSTREAM_SHOW_SLOTS printf("pause() -- Card: %d Stream: %d\n",card_number,stream_number); #endif // RPLAYSTREAM_SHOW_SLOTS - hpi_err_t hpi_error; uint16_t state; uint32_t buffer_size; uint32_t data_to_play; @@ -537,10 +532,10 @@ void RDHPIPlayStream::pause() return; } if(playing) { - hpi_error=HPI_OutStreamStop(NULL,hpi_stream); + LogHpi(HPI_OutStreamStop(NULL,hpi_stream)); clock->stop(); - hpi_error=HPI_OutStreamGetInfoEx(NULL,hpi_stream,&state,&buffer_size, - &data_to_play,&samples_played,&reserved); + LogHpi(HPI_OutStreamGetInfoEx(NULL,hpi_stream,&state,&buffer_size, + &data_to_play,&samples_played,&reserved)); switch(getFormatTag()) { case WAVE_FORMAT_PCM: samples_pending=data_to_play/(getChannels()*getBitsPerSample()/8); @@ -569,18 +564,17 @@ void RDHPIPlayStream::stop() printf("stop() -- Card: %d Stream: %d\n",card_number,stream_number); #endif // RPLAYSTREAM_SHOW_SLOTS - hpi_err_t hpi_error; if(!is_open) { return; } if(playing|is_paused) { - hpi_error=HPI_OutStreamStop(NULL,hpi_stream); + LogHpi(HPI_OutStreamStop(NULL,hpi_stream)); clock->stop(); playing=false; is_paused=false; seekWave(0,SEEK_SET); - hpi_error=HPI_OutStreamReset(NULL,hpi_stream); + LogHpi(HPI_OutStreamReset(NULL,hpi_stream)); samples_pending=0; samples_skipped=0; stream_state=RDHPIPlayStream::Stopped; @@ -610,8 +604,6 @@ int RDHPIPlayStream::currentPosition() bool RDHPIPlayStream::setPosition(unsigned samples) { - hpi_err_t hpi_error; - #ifdef RPLAYSTREAM_SHOW_SLOTS printf("setPosition(%d) -- Card: %d Stream: %d\n",samples, card_number,stream_number); @@ -629,7 +621,7 @@ bool RDHPIPlayStream::setPosition(unsigned samples) is_paused=false; repositioned=true; } - hpi_error=HPI_OutStreamReset(NULL,hpi_stream); + LogHpi(HPI_OutStreamReset(NULL,hpi_stream)); samples_played=0; switch(getFormatTag()) { case WAVE_FORMAT_PCM: @@ -755,12 +747,10 @@ void RDHPIPlayStream::Drained() int RDHPIPlayStream::GetStream() { - hpi_err_t hpi_error; - #ifdef RDHPIPLAYSTREAM_USE_LOCAL_MUTEX for(int i=0;igetCardOutputStreams(card_number);i++) { if(++stream_mutex[card_number][i]==1) { - hpi_error=HPI_OutStreamOpen(NULL,card_index[card_number],i,&hpi_stream); + LogHpi(HPI_OutStreamOpen(NULL,card_index[card_number],i,&hpi_stream)); stream_number=i; return stream_number; } @@ -784,15 +774,25 @@ int RDHPIPlayStream::GetStream() void RDHPIPlayStream::FreeStream() { - hpi_err_t hpi_error; - #ifdef RDHPIPLAYSTREAM_USE_LOCAL_MUTEX stream_mutex[card_number][stream_number]--; - hpi_error=HPI_OutStreamClose(NULL,hpi_stream); + LogHpi(HPI_OutStreamClose(NULL,hpi_stream)); stream_number=-1; #else - hpi_error=HPI_OutStreamClose(NULL,hpi_stream); + LogHpi(HPI_OutStreamClose(NULL,hpi_stream)); // syslog(LOG_ERR,"HPI closing ostream: %d",stream_number); stream_number=-1; #endif } + + +hpi_err_t RDHPIPlayStream::LogHpi(hpi_err_t err) +{ + char err_txt[200]; + + if(err!=0) { + HPI_GetErrorText(err,err_txt); + syslog(LOG_NOTICE,"HPI Error: %s",err_txt); + } + return err; +} diff --git a/rdhpi/rdhpiplaystream.h b/rdhpi/rdhpiplaystream.h index 80944ab4..975d1cf3 100644 --- a/rdhpi/rdhpiplaystream.h +++ b/rdhpi/rdhpiplaystream.h @@ -91,6 +91,7 @@ class RDHPIPlayStream : public QObject,public RDWaveFile void Drained(); int GetStream(); void FreeStream(); + hpi_err_t LogHpi(hpi_err_t err); RDHPISoundCard *sound_card; RDHPIPlayStream::State stream_state; QString wave_name; diff --git a/rdhpi/rdhpirecordstream.cpp b/rdhpi/rdhpirecordstream.cpp index 918849ff..7c9a459b 100644 --- a/rdhpi/rdhpirecordstream.cpp +++ b/rdhpi/rdhpirecordstream.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -39,7 +40,6 @@ RDHPIRecordStream::RDHPIRecordStream(RDHPISoundCard *card, QWidget *parent,const char *name) :QObject(parent,name),RDWaveFile() { - hpi_err_t hpi_err; int quan; uint16_t type[HPI_MAX_ADAPTERS]; @@ -79,9 +79,9 @@ RDHPIRecordStream::RDHPIRecordStream(RDHPISoundCard *card, card_index[i]=i; } #else - hpi_err=HPI_SubSysGetNumAdapters(NULL,&quan); + LogHpi(HPI_SubSysGetNumAdapters(NULL,&quan)); for(int i=0;istop(); is_recording=false; @@ -626,11 +619,9 @@ void RDHPIRecordStream::setRecordLength(int length) void RDHPIRecordStream::tickClock() { - hpi_err_t hpi_err; - - hpi_err=HPI_InStreamGetInfoEx(NULL,hpi_stream, - &state,&buffer_size,&data_recorded, - &samples_recorded,&reserved); + LogHpi(HPI_InStreamGetInfoEx(NULL,hpi_stream, + &state,&buffer_size,&data_recorded, + &samples_recorded,&reserved)); if((!record_started)&&(is_recording)) { if(samples_recorded>0) { if(record_length>0) { @@ -647,23 +638,22 @@ void RDHPIRecordStream::tickClock() } while(data_recorded>fragment_size) { #if HPI_VER > 0x00030500 - hpi_err=HPI_InStreamReadBuf(NULL,hpi_stream,pdata,fragment_size); + LogHpi(HPI_InStreamReadBuf(NULL,hpi_stream,pdata,fragment_size)); #else - hpi_err=HPI_InStreamRead(NULL,hpi_stream,&hpi_data); + LogHpi(HPI_InStreamRead(NULL,hpi_stream,&hpi_data)); #endif if(is_recording) { writeWave(pdata,fragment_size); } - hpi_err=HPI_InStreamGetInfoEx(NULL,hpi_stream, - &state,&buffer_size,&data_recorded, - &samples_recorded,&reserved); + LogHpi(HPI_InStreamGetInfoEx(NULL,hpi_stream,&state,&buffer_size, + &data_recorded,&samples_recorded,&reserved)); } if(state==HPI_STATE_STOPPED) { #if HPI_VER > 0x00030500 - hpi_err=HPI_InStreamReadBuf(NULL,hpi_stream,pdata,data_recorded); + LogHpi(HPI_InStreamReadBuf(NULL,hpi_stream,pdata,data_recorded)); #else - hpi_err=HPI_DataCreate(&hpi_data,&format,pdata,data_recorded); - hpi_err=HPI_InStreamRead(NULL,hpi_stream,&hpi_data); + LogHpi(HPI_DataCreate(&hpi_data,&format,pdata,data_recorded)); + LogHpi(HPI_InStreamRead(NULL,hpi_stream,&hpi_data)); #endif if(is_recording) { writeWave(pdata,data_recorded); @@ -696,8 +686,17 @@ bool RDHPIRecordStream::GetStream() void RDHPIRecordStream::FreeStream() { - hpi_err_t hpi_err; - - hpi_err=HPI_InStreamClose(NULL,hpi_stream); + LogHpi(HPI_InStreamClose(NULL,hpi_stream)); } + +hpi_err_t RDHPIRecordStream::LogHpi(hpi_err_t err) +{ + char err_txt[200]; + + if(err!=0) { + HPI_GetErrorText(err,err_txt); + syslog(LOG_NOTICE,"HPI Error: %s",err_txt); + } + return err; +} diff --git a/rdhpi/rdhpirecordstream.h b/rdhpi/rdhpirecordstream.h index 2c5e1bd8..b53a9e19 100644 --- a/rdhpi/rdhpirecordstream.h +++ b/rdhpi/rdhpirecordstream.h @@ -96,6 +96,7 @@ class RDHPIRecordStream : public QObject,public RDWaveFile private: bool GetStream(); void FreeStream(); + hpi_err_t LogHpi(hpi_err_t err); RDHPISoundCard *sound_card; bool debug; bool xrun; diff --git a/rdhpi/rdhpisoundcard.cpp b/rdhpi/rdhpisoundcard.cpp index 2ae1273d..21708542 100644 --- a/rdhpi/rdhpisoundcard.cpp +++ b/rdhpi/rdhpisoundcard.cpp @@ -21,6 +21,7 @@ // // +#include #include #include @@ -226,18 +227,15 @@ RDHPISoundCard::SourceNode RDHPISoundCard::getInputPortMux(int card,int port) { uint16_t type; uint16_t index; - hpi_err_t hpi_err; - hpi_err=HPI_Multiplexer_GetSource(NULL,input_mux_control[card][port], - &type,&index); + LogHpi(HPI_Multiplexer_GetSource(NULL,input_mux_control[card][port], + &type,&index)); return (RDHPISoundCard::SourceNode)type; } bool RDHPISoundCard::setInputPortMux(int card,int port,RDHPISoundCard::SourceNode node) { - hpi_err_t hpi_error; - switch(node) { case RDHPISoundCard::LineIn: if(HPI_Multiplexer_SetSource(NULL, @@ -247,10 +245,9 @@ bool RDHPISoundCard::setInputPortMux(int card,int port,RDHPISoundCard::SourceNod } break; case RDHPISoundCard::AesEbuIn: - if((hpi_error= - HPI_Multiplexer_SetSource(NULL, - input_mux_control[card][port],node, - input_mux_index[card][port][1]))!=0) { + if(HPI_Multiplexer_SetSource(NULL, + input_mux_control[card][port],node, + input_mux_index[card][port][1])!=0) { return false; } break; @@ -265,12 +262,11 @@ bool RDHPISoundCard::setInputPortMux(int card,int port,RDHPISoundCard::SourceNod unsigned short RDHPISoundCard::getInputPortError(int card,int port) { uint16_t error_word=0; - hpi_err_t hpi_err; if(input_port_aesebu[card][port]) { - hpi_err=HPI_AESEBU_Receiver_GetErrorStatus(NULL, - input_port_aesebu_control[card][port], - &error_word); + LogHpi(HPI_AESEBU_Receiver_GetErrorStatus(NULL, + input_port_aesebu_control[card][port], + &error_word)); } return error_word; } @@ -366,64 +362,55 @@ int RDHPISoundCard::tunerHighFrequency(int card,int port, bool RDHPISoundCard::inputStreamMeter(int card,int stream,short *level) { - hpi_err_t hpi_err; - if(card>=card_quantity) { return false; } if(stream>=card_input_streams[card]) { return false; } - hpi_err=HPI_MeterGetPeak(NULL, - input_stream_meter_control[card][stream],level); + LogHpi(HPI_MeterGetPeak(NULL, + input_stream_meter_control[card][stream],level)); return true; } bool RDHPISoundCard::outputStreamMeter(int card,int stream,short *level) { - hpi_err_t hpi_err; - if(card>=card_quantity) { return false; } if(stream>=card_output_streams[card]) { return false; } - hpi_err=HPI_MeterGetPeak(NULL, - output_stream_meter_control[card][stream],level); + LogHpi(HPI_MeterGetPeak(NULL, + output_stream_meter_control[card][stream],level)); return true; } bool RDHPISoundCard::inputPortMeter(int card,int port,short *level) { - hpi_err_t hpi_err; - if(card>=card_quantity) { return false; } if(port>=card_input_ports[card]) { return false; } - hpi_err=HPI_MeterGetPeak(NULL, - input_port_meter_control[card][port],level); + LogHpi(HPI_MeterGetPeak(NULL, + input_port_meter_control[card][port],level)); return true; } bool RDHPISoundCard::outputPortMeter(int card,int port,short *level) { - hpi_err_t hpi_err; - if(card>=card_quantity) { return false; } if(port>=card_output_ports[card]) { return false; } - hpi_err=HPI_MeterGetPeak(NULL, - output_port_meter_control[card][port],level); + LogHpi(HPI_MeterGetPeak(NULL,output_port_meter_control[card][port],level)); return true; } @@ -471,10 +458,9 @@ bool RDHPISoundCard::haveInputStreamMux(int card,int stream) const int RDHPISoundCard::getInputVolume(int card,int stream,int port) { short gain[2]; - hpi_err_t hpi_err; - hpi_err=HPI_VolumeGetGain(NULL, - input_stream_volume_control[card][stream][port],gain); + LogHpi(HPI_VolumeGetGain(NULL, + input_stream_volume_control[card][stream][port],gain)); return gain[0]; } @@ -482,10 +468,9 @@ int RDHPISoundCard::getInputVolume(int card,int stream,int port) int RDHPISoundCard::getOutputVolume(int card,int stream,int port) { short gain[2]; - hpi_err_t hpi_err; - hpi_err=HPI_VolumeGetGain(NULL, - output_stream_volume_control[card][stream][port],gain); + LogHpi(HPI_VolumeGetGain(NULL, + output_stream_volume_control[card][stream][port],gain)); return gain[0]; } @@ -493,10 +478,8 @@ int RDHPISoundCard::getOutputVolume(int card,int stream,int port) int RDHPISoundCard::getInputLevel(int card,int port) { short gain[2]; - hpi_err_t hpi_err; - hpi_err=HPI_VolumeGetGain(NULL, - input_port_level_control[card][port],gain); + LogHpi(HPI_VolumeGetGain(NULL,input_port_level_control[card][port],gain)); return gain[0]; } @@ -504,10 +487,8 @@ int RDHPISoundCard::getInputLevel(int card,int port) int RDHPISoundCard::getOutputLevel(int card,int port) { short gain[2]; - hpi_err_t hpi_err; - hpi_err=HPI_VolumeGetGain(NULL, - output_port_level_control[card][port],gain); + LogHpi(HPI_VolumeGetGain(NULL,output_port_level_control[card][port],gain)); return gain[0]; } @@ -515,31 +496,28 @@ int RDHPISoundCard::getOutputLevel(int card,int port) void RDHPISoundCard::setInputVolume(int card,int stream,int level) { - hpi_err_t hpi_err; - if(!haveInputVolume(card,stream,0)) { return; } short gain[2]; gain[0]=level; gain[1]=level; - hpi_err=HPI_VolumeSetGain(NULL, - input_stream_volume_control[card][stream][0],gain); + LogHpi(HPI_VolumeSetGain(NULL, + input_stream_volume_control[card][stream][0],gain)); } void RDHPISoundCard::setOutputVolume(int card,int stream,int port,int level) { - hpi_err_t hpi_err; - if(!haveOutputVolume(card,stream,port)) { return; } short gain[2]; gain[0]=level; gain[1]=level; - hpi_err=HPI_VolumeSetGain(NULL, - output_stream_volume_control[card][stream][port],gain); + LogHpi(HPI_VolumeSetGain(NULL, + output_stream_volume_control[card][stream][port], + gain)); } @@ -547,8 +525,6 @@ void RDHPISoundCard::setOutputVolume(int card,int stream,int port,int level) void RDHPISoundCard::fadeOutputVolume(int card,int stream,int port, int level,int length) { - hpi_err_t hpi_err; - if(!haveOutputVolume(card,stream,port)) { return; } @@ -556,15 +532,14 @@ void RDHPISoundCard::fadeOutputVolume(int card,int stream,int port, gain[0]=level; gain[1]=level; - hpi_err=HPI_VolumeAutoFadeProfile(NULL, - output_stream_volume_control[card][stream][port], - gain,length,hpi_fade_type); + LogHpi(HPI_VolumeAutoFadeProfile(NULL, + output_stream_volume_control[card][stream][port], + gain,length,hpi_fade_type)); } void RDHPISoundCard::setInputLevel(int card,int port,int level) { - hpi_err_t hpi_err; short gain[HPI_MAX_CHANNELS]; if(!haveInputLevel(card,port)) { @@ -573,13 +548,12 @@ void RDHPISoundCard::setInputLevel(int card,int port,int level) for(unsigned i=0;i>7)&63); hpi_info[i].setPcbVersion((char)(((dummy_version>>3)&7)+'A')); hpi_info[i].setAssemblyVersion(dummy_version&7); - hpi_err=HPI_AdapterClose(NULL,card_index[i]); + LogHpi(HPI_AdapterClose(NULL,card_index[i])); str=QString(tr("Input Stream")); for(int j=0;jstart(METER_INTERVAL); } + + +hpi_err_t RDHPISoundCard::LogHpi(hpi_err_t err) +{ + char err_txt[200]; + + if(err!=0) { + HPI_GetErrorText(err,err_txt); + syslog(LOG_NOTICE,"HPI Error: %s",err_txt); + } + return err; +} diff --git a/rdhpi/rdhpisoundcard.h b/rdhpi/rdhpisoundcard.h index 57f31dfb..7cfc6461 100644 --- a/rdhpi/rdhpisoundcard.h +++ b/rdhpi/rdhpisoundcard.h @@ -172,6 +172,7 @@ class RDHPISoundCard : public QObject private: void HPIProbe(); + hpi_err_t LogHpi(hpi_err_t err); uint16_t card_input_streams[HPI_MAX_ADAPTERS]; uint16_t card_output_streams[HPI_MAX_ADAPTERS]; uint16_t card_input_ports[HPI_MAX_ADAPTERS]; diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index 90024214..efed57cf 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -895,22 +895,15 @@ void EditLog::deleteButtonData() int count=0; QListViewItem *next=edit_log_list->firstChild(); - QListViewItem *item=NULL; int line=0; - bool select_end=false; while(next!=NULL) { if(edit_log_list->isSelected(next)) { if(next->text(12).toInt()!=END_MARKER_ID) { if(count==0) { line=next->text(13).toInt(); - item=next; } count++; - if(next->text(13).toInt()==edit_log_event->size()-1) { - select_end=true; - } - item=next->nextSibling(); } } next=next->nextSibling(); diff --git a/rdlogmanager/rdlogmanager.cpp b/rdlogmanager/rdlogmanager.cpp index 98497331..180458e7 100644 --- a/rdlogmanager/rdlogmanager.cpp +++ b/rdlogmanager/rdlogmanager.cpp @@ -418,7 +418,6 @@ int main(int argc,char *argv[]) QString cmd_report=NULL; int cmd_start_offset=0; int cmd_end_offset=0; - QDate cmd_start_date = QDate::currentDate().addDays(1); RDCmdSwitch *cmd= new RDCmdSwitch(argc,argv,"rdlogmanager",RDLOGMANAGER_USAGE); diff --git a/rdrepld/replfactory.h b/rdrepld/replfactory.h index ad1d2861..a01a8f7b 100644 --- a/rdrepld/replfactory.h +++ b/rdrepld/replfactory.h @@ -30,7 +30,7 @@ class ReplFactory { public: ReplFactory(ReplConfig *config); - ~ReplFactory(); + virtual ~ReplFactory(); ReplConfig *config() const; virtual void startProcess()=0; virtual bool processCart(const unsigned cartnum)=0; diff --git a/ripcd/acu1p.cpp b/ripcd/acu1p.cpp index 01297da8..0fbd6011 100644 --- a/ripcd/acu1p.cpp +++ b/ripcd/acu1p.cpp @@ -70,11 +70,9 @@ Acu1p::Acu1p(RDMatrix *matrix,QObject *parent,const char *name) // Interval OneShots // bt_gpi_oneshot=new RDOneShot(this); - connect(bt_gpi_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpiOneshotData(void*))); + connect(bt_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int))); bt_gpo_oneshot=new RDOneShot(this); - connect(bt_gpo_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpoOneshotData(void*))); + connect(bt_gpo_oneshot,SIGNAL(timeout(int)),this,SLOT(gpoOneshotData(int))); // // Poll Timer @@ -192,12 +190,12 @@ void Acu1p::processCommand(RDMacro *cmd) bt_gpi_state[cmd->arg(2).toInt()-1]=true; } bt_gpi_mask[cmd->arg(2).toInt()-1]=true; - bt_gpi_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpi_oneshot->start(cmd->arg(2).toInt()-1,500); } if(cmd->arg(1).toString().lower()=="o") { PulseRelay(cmd->arg(2).toInt()-1); emit gpoChanged(bt_matrix,cmd->arg(2).toInt()-1,true); - bt_gpo_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpo_oneshot->start(cmd->arg(2).toInt()-1,500); } } } @@ -277,8 +275,8 @@ void Acu1p::processCommand(RDMacro *cmd) void Acu1p::pollData() { - char data[]={0xAA,ACU1P_UNIT_ID,0x39}; - bt_device->writeBlock(data,3); + uint8_t data[]={0xAA,ACU1P_UNIT_ID,0x39}; + bt_device->writeBlock((char *)data,3); } @@ -295,14 +293,14 @@ void Acu1p::readyReadData(int sock) } -void Acu1p::gpiOneshotData(void *data) +void Acu1p::gpiOneshotData(int value) { } -void Acu1p::gpoOneshotData(void *data) +void Acu1p::gpoOneshotData(int value) { - emit gpoChanged(bt_matrix,(long)data,false); + emit gpoChanged(bt_matrix,value,false); } diff --git a/ripcd/acu1p.h b/ripcd/acu1p.h index 53691929..6f24defe 100644 --- a/ripcd/acu1p.h +++ b/ripcd/acu1p.h @@ -56,8 +56,8 @@ class Acu1p : public Switcher private slots: void pollData(); void readyReadData(int sock); - void gpiOneshotData(void *data); - void gpoOneshotData(void *data); + void gpiOneshotData(int value); + void gpoOneshotData(int value); private: void ProcessGpi(uint16_t gpi_data); diff --git a/ripcd/bt16x2.cpp b/ripcd/bt16x2.cpp index 1ad35bee..97e95631 100644 --- a/ripcd/bt16x2.cpp +++ b/ripcd/bt16x2.cpp @@ -67,11 +67,9 @@ Bt16x2::Bt16x2(RDMatrix *matrix,QObject *parent,const char *name) // Interval OneShots // bt_gpi_oneshot=new RDOneShot(this); - connect(bt_gpi_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpiOneshotData(void*))); + connect(bt_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int))); bt_gpo_oneshot=new RDOneShot(this); - connect(bt_gpo_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpoOneshotData(void*))); + connect(bt_gpo_oneshot,SIGNAL(timeout(int)),this,SLOT(gpoOneshotData(int))); // // The Poll Timer @@ -190,13 +188,13 @@ void Bt16x2::processCommand(RDMacro *cmd) bt_gpi_state[cmd->arg(2).toInt()-1]=true; } bt_gpi_mask[cmd->arg(2).toInt()-1]=true; - bt_gpi_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpi_oneshot->start(cmd->arg(2).toInt()-1,500); } if(cmd->arg(1).toString().lower()=="o") { sprintf(str,"*%dOR%02dP",BT16X2_UNIT_ID,cmd->arg(2).toInt()); bt_device->writeBlock(str,6); emit gpoChanged(bt_matrix,cmd->arg(2).toInt()-1,true); - bt_gpo_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpo_oneshot->start(cmd->arg(2).toInt()-1,500); } } } @@ -352,14 +350,14 @@ void Bt16x2::processStatus() } -void Bt16x2::gpiOneshotData(void *data) +void Bt16x2::gpiOneshotData(int value) { - bt_gpi_mask[(long)data]=false; + bt_gpi_mask[value]=false; bt_device->writeBlock("*0SPA",5); } -void Bt16x2::gpoOneshotData(void *data) +void Bt16x2::gpoOneshotData(int value) { - emit gpoChanged(bt_matrix,(long)data,false); + emit gpoChanged(bt_matrix,value,false); } diff --git a/ripcd/bt16x2.h b/ripcd/bt16x2.h index 72fe6e78..bc45e699 100644 --- a/ripcd/bt16x2.h +++ b/ripcd/bt16x2.h @@ -50,8 +50,8 @@ class Bt16x2 : public Switcher private slots: void processStatus(); - void gpiOneshotData(void *data); - void gpoOneshotData(void *data); + void gpiOneshotData(int value); + void gpoOneshotData(int value); private: RDTTYDevice *bt_device; diff --git a/ripcd/btacs82.cpp b/ripcd/btacs82.cpp index b5021b93..5c4e790b 100644 --- a/ripcd/btacs82.cpp +++ b/ripcd/btacs82.cpp @@ -68,10 +68,10 @@ BtAcs82::BtAcs82(RDMatrix *matrix,QObject *parent,const char *name) // bt_gpi_oneshot=new RDOneShot(this); connect(bt_gpi_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpiOneshotData(void*))); + this,SLOT(gpiOneshotData(int))); bt_gpo_oneshot=new RDOneShot(this); connect(bt_gpo_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpoOneshotData(void*))); + this,SLOT(gpoOneshotData(int))); // // The Poll Timer @@ -191,13 +191,13 @@ void BtAcs82::processCommand(RDMacro *cmd) bt_gpi_state[cmd->arg(2).toInt()-1]=true; } bt_gpi_mask[cmd->arg(2).toInt()-1]=true; - bt_gpi_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpi_oneshot->start(cmd->arg(2).toInt()-1,500); } if(cmd->arg(1).toString().lower()=="o") { sprintf(str,"*%dOR%dP",BTACS82_UNIT_ID,cmd->arg(2).toInt()); bt_device->writeBlock(str,6); emit gpoChanged(bt_matrix,cmd->arg(2).toInt()-1,true); - bt_gpo_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpo_oneshot->start(cmd->arg(2).toInt()-1,500); } } } @@ -423,14 +423,14 @@ void BtAcs82::processStatus() } -void BtAcs82::gpiOneshotData(void *data) +void BtAcs82::gpiOneshotData(int value) { - bt_gpi_mask[(long)data]=false; + bt_gpi_mask[value]=false; bt_device->writeBlock("*0SPA",5); } -void BtAcs82::gpoOneshotData(void *data) +void BtAcs82::gpoOneshotData(int value) { - emit gpoChanged(bt_matrix,(long)data,false); + emit gpoChanged(bt_matrix,value,false); } diff --git a/ripcd/btacs82.h b/ripcd/btacs82.h index db05b85b..bd5a2b13 100644 --- a/ripcd/btacs82.h +++ b/ripcd/btacs82.h @@ -51,8 +51,8 @@ class BtAcs82 : public Switcher private slots: void processStatus(); - void gpiOneshotData(void *data); - void gpoOneshotData(void *data); + void gpiOneshotData(int value); + void gpoOneshotData(int value); private: RDTTYDevice *bt_device; diff --git a/ripcd/btsrc16.cpp b/ripcd/btsrc16.cpp index 05c2b8e1..30045e58 100644 --- a/ripcd/btsrc16.cpp +++ b/ripcd/btsrc16.cpp @@ -65,11 +65,9 @@ BtSrc16::BtSrc16(RDMatrix *matrix,QObject *parent,const char *name) // Interval OneShots // bt_gpi_oneshot=new RDOneShot(this); - connect(bt_gpi_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpiOneshotData(void*))); + connect(bt_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int))); bt_gpo_oneshot=new RDOneShot(this); - connect(bt_gpo_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpoOneshotData(void*))); + connect(bt_gpo_oneshot,SIGNAL(timeout(int)),this,SLOT(gpoOneshotData(int))); // // The Poll Timer @@ -189,7 +187,7 @@ void BtSrc16::processCommand(RDMacro *cmd) bt_gpi_state[cmd->arg(2).toInt()-1]=true; } bt_gpi_mask[cmd->arg(2).toInt()-1]=true; - bt_gpi_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpi_oneshot->start(cmd->arg(2).toInt()-1,500); } if(cmd->arg(1).toString().lower()=="o") { sprintf(str,"*%dOR%02dP%02d\r\n", @@ -197,7 +195,7 @@ void BtSrc16::processCommand(RDMacro *cmd) cmd->arg(4).toInt()/100+1); bt_device->writeBlock(str,11); emit gpoChanged(bt_matrix,cmd->arg(2).toInt()-1,true); - bt_gpo_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpo_oneshot->start(cmd->arg(2).toInt()-1,500); } } } @@ -333,14 +331,14 @@ void BtSrc16::processStatus() } -void BtSrc16::gpiOneshotData(void *data) +void BtSrc16::gpiOneshotData(int value) { - bt_gpi_mask[(long)data]=false; + bt_gpi_mask[value]=false; bt_device->writeBlock("*0SPA",5); } -void BtSrc16::gpoOneshotData(void *data) +void BtSrc16::gpoOneshotData(int value) { - emit gpoChanged(bt_matrix,(long)data,false); + emit gpoChanged(bt_matrix,value,false); } diff --git a/ripcd/btsrc16.h b/ripcd/btsrc16.h index 1a839d5c..32ada7e3 100644 --- a/ripcd/btsrc16.h +++ b/ripcd/btsrc16.h @@ -51,8 +51,8 @@ class BtSrc16 : public Switcher private slots: void processStatus(); - void gpiOneshotData(void *data); - void gpoOneshotData(void *data); + void gpiOneshotData(int value); + void gpoOneshotData(int value); private: RDTTYDevice *bt_device; diff --git a/ripcd/btsrc8iii.cpp b/ripcd/btsrc8iii.cpp index 876c3c68..1351e9ee 100644 --- a/ripcd/btsrc8iii.cpp +++ b/ripcd/btsrc8iii.cpp @@ -65,11 +65,9 @@ BtSrc8Iii::BtSrc8Iii(RDMatrix *matrix,QObject *parent,const char *name) // Interval OneShots // bt_gpi_oneshot=new RDOneShot(this); - connect(bt_gpi_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpiOneshotData(void*))); + connect(bt_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int))); bt_gpo_oneshot=new RDOneShot(this); - connect(bt_gpo_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpoOneshotData(void*))); + connect(bt_gpo_oneshot,SIGNAL(timeout(int)),this,SLOT(gpoOneshotData(int))); // // The Poll Timer @@ -189,7 +187,7 @@ void BtSrc8Iii::processCommand(RDMacro *cmd) bt_gpi_state[cmd->arg(2).toInt()-1]=true; } bt_gpi_mask[cmd->arg(2).toInt()-1]=true; - bt_gpi_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpi_oneshot->start(cmd->arg(2).toInt()-1,500); } if(cmd->arg(1).toString().lower()=="o") { sprintf(str,"*%dOR%dP%02d\r\n", @@ -197,7 +195,7 @@ void BtSrc8Iii::processCommand(RDMacro *cmd) cmd->arg(4).toInt()/100+1); bt_device->writeBlock(str,10); emit gpoChanged(bt_matrix,cmd->arg(2).toInt()-1,true); - bt_gpo_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpo_oneshot->start(cmd->arg(2).toInt()-1,500); } } } @@ -317,14 +315,14 @@ void BtSrc8Iii::processStatus() } -void BtSrc8Iii::gpiOneshotData(void *data) +void BtSrc8Iii::gpiOneshotData(int value) { - bt_gpi_mask[(long)data]=false; + bt_gpi_mask[value]=false; bt_device->writeBlock("*0SPA",5); } -void BtSrc8Iii::gpoOneshotData(void *data) +void BtSrc8Iii::gpoOneshotData(int value) { - emit gpoChanged(bt_matrix,(long)data,false); + emit gpoChanged(bt_matrix,value,false); } diff --git a/ripcd/btsrc8iii.h b/ripcd/btsrc8iii.h index 5002ff96..47a66802 100644 --- a/ripcd/btsrc8iii.h +++ b/ripcd/btsrc8iii.h @@ -50,8 +50,8 @@ class BtSrc8Iii : public Switcher private slots: void processStatus(); - void gpiOneshotData(void *data); - void gpoOneshotData(void *data); + void gpiOneshotData(int value); + void gpoOneshotData(int value); private: RDTTYDevice *bt_device; diff --git a/ripcd/btss164.cpp b/ripcd/btss164.cpp index 02aea0da..96b0d1a0 100644 --- a/ripcd/btss164.cpp +++ b/ripcd/btss164.cpp @@ -67,11 +67,9 @@ BtSs164::BtSs164(RDMatrix *matrix,QObject *parent,const char *name) // Interval OneShots // bt_gpi_oneshot=new RDOneShot(this); - connect(bt_gpi_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpiOneshotData(void*))); + connect(bt_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int))); bt_gpo_oneshot=new RDOneShot(this); - connect(bt_gpo_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpoOneshotData(void*))); + connect(bt_gpo_oneshot,SIGNAL(timeout(int)),this,SLOT(gpoOneshotData(int))); // // The Poll Timer @@ -204,7 +202,7 @@ void BtSs164::processCommand(RDMacro *cmd) bt_gpi_state[cmd->arg(2).toInt()-1]=true; } bt_gpi_mask[cmd->arg(2).toInt()-1]=true; - bt_gpi_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpi_oneshot->start(cmd->arg(2).toInt()-1,500); } if(cmd->arg(1).toString().lower()=="o") { if(cmd->arg(2).toInt()<8) { @@ -217,7 +215,7 @@ void BtSs164::processCommand(RDMacro *cmd) bt_device->writeBlock(str,8); } emit gpoChanged(bt_matrix,cmd->arg(2).toInt()-1,true); - bt_gpo_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpo_oneshot->start(cmd->arg(2).toInt()-1,500); } } } @@ -419,14 +417,14 @@ void BtSs164::processStatus() } -void BtSs164::gpiOneshotData(void *data) +void BtSs164::gpiOneshotData(int value) { - bt_gpi_mask[(long)data]=false; + bt_gpi_mask[value]=false; bt_device->writeBlock("*0SPA",5); } -void BtSs164::gpoOneshotData(void *data) +void BtSs164::gpoOneshotData(int value) { - emit gpoChanged(bt_matrix,(long)data,false); + emit gpoChanged(bt_matrix,value,false); } diff --git a/ripcd/btss164.h b/ripcd/btss164.h index 531dafee..705a0f9a 100644 --- a/ripcd/btss164.h +++ b/ripcd/btss164.h @@ -50,8 +50,8 @@ class BtSs164 : public Switcher private slots: void processStatus(); - void gpiOneshotData(void *data); - void gpoOneshotData(void *data); + void gpiOneshotData(int value); + void gpoOneshotData(int value); private: RDTTYDevice *bt_device; diff --git a/ripcd/btss42.cpp b/ripcd/btss42.cpp index fba200f0..8fdd4da7 100644 --- a/ripcd/btss42.cpp +++ b/ripcd/btss42.cpp @@ -67,11 +67,9 @@ BtSs42::BtSs42(RDMatrix *matrix,QObject *parent,const char *name) // Interval OneShots // bt_gpi_oneshot=new RDOneShot(this); - connect(bt_gpi_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpiOneshotData(void*))); + connect(bt_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int))); bt_gpo_oneshot=new RDOneShot(this); - connect(bt_gpo_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpoOneshotData(void*))); + connect(bt_gpo_oneshot,SIGNAL(timeout(int)),this,SLOT(gpoOneshotData(int))); // // The Poll Timer @@ -200,7 +198,7 @@ void BtSs42::processCommand(RDMacro *cmd) bt_gpi_state[cmd->arg(2).toInt()-1]=true; } bt_gpi_mask[cmd->arg(2).toInt()-1]=true; - bt_gpi_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpi_oneshot->start(cmd->arg(2).toInt()-1,500); } if(cmd->arg(1).toString().lower()=="o") { if(cmd->arg(2).toInt()<=4) { @@ -211,7 +209,7 @@ void BtSs42::processCommand(RDMacro *cmd) } bt_device->writeBlock(str,6); emit gpoChanged(bt_matrix,cmd->arg(2).toInt()-1,true); - bt_gpo_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpo_oneshot->start(cmd->arg(2).toInt()-1,500); } } } @@ -405,14 +403,14 @@ void BtSs42::processStatus() } -void BtSs42::gpiOneshotData(void *data) +void BtSs42::gpiOneshotData(int value) { - bt_gpi_mask[(long)data]=false; + bt_gpi_mask[value]=false; bt_device->writeBlock("*0SPA",5); } -void BtSs42::gpoOneshotData(void *data) +void BtSs42::gpoOneshotData(int value) { - emit gpoChanged(bt_matrix,(long)data,false); + emit gpoChanged(bt_matrix,value,false); } diff --git a/ripcd/btss42.h b/ripcd/btss42.h index 3bbedb05..f1438275 100644 --- a/ripcd/btss42.h +++ b/ripcd/btss42.h @@ -50,8 +50,8 @@ class BtSs42 : public Switcher private slots: void processStatus(); - void gpiOneshotData(void *data); - void gpoOneshotData(void *data); + void gpiOneshotData(int value); + void gpoOneshotData(int value); private: RDTTYDevice *bt_device; diff --git a/ripcd/btss44.cpp b/ripcd/btss44.cpp index fee5cac5..5a644bae 100644 --- a/ripcd/btss44.cpp +++ b/ripcd/btss44.cpp @@ -66,11 +66,9 @@ BtSs44::BtSs44(RDMatrix *matrix,QObject *parent,const char *name) // Interval OneShots // bt_gpi_oneshot=new RDOneShot(this); - connect(bt_gpi_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpiOneshotData(void*))); + connect(bt_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int))); bt_gpo_oneshot=new RDOneShot(this); - connect(bt_gpo_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpoOneshotData(void*))); + connect(bt_gpo_oneshot,SIGNAL(timeout(int)),this,SLOT(gpoOneshotData(int))); // // The Poll Timer @@ -200,7 +198,7 @@ void BtSs44::processCommand(RDMacro *cmd) bt_gpi_state[cmd->arg(2).toInt()-1]=true; } bt_gpi_mask[cmd->arg(2).toInt()-1]=true; - bt_gpi_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpi_oneshot->start(cmd->arg(2).toInt()-1,500); } if(cmd->arg(1).toString().lower()=="o") { if(cmd->arg(2).toInt()<=4) { @@ -211,7 +209,7 @@ void BtSs44::processCommand(RDMacro *cmd) } bt_device->writeBlock(str,6); emit gpoChanged(bt_matrix,cmd->arg(2).toInt()-1,true); - bt_gpo_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpo_oneshot->start(cmd->arg(2).toInt()-1,500); } } } @@ -405,14 +403,14 @@ void BtSs44::processStatus() } -void BtSs44::gpiOneshotData(void *data) +void BtSs44::gpiOneshotData(int value) { - bt_gpi_mask[(long)data]=false; + bt_gpi_mask[value]=false; bt_device->writeBlock("*0SPA",5); } -void BtSs44::gpoOneshotData(void *data) +void BtSs44::gpoOneshotData(int value) { - emit gpoChanged(bt_matrix,(long)data,false); + emit gpoChanged(bt_matrix,value,false); } diff --git a/ripcd/btss44.h b/ripcd/btss44.h index 8dab7741..e55bbe94 100644 --- a/ripcd/btss44.h +++ b/ripcd/btss44.h @@ -50,8 +50,8 @@ class BtSs44 : public Switcher private slots: void processStatus(); - void gpiOneshotData(void *data); - void gpoOneshotData(void *data); + void gpiOneshotData(int value); + void gpoOneshotData(int value); private: RDTTYDevice *bt_device; diff --git a/ripcd/btss82.cpp b/ripcd/btss82.cpp index ba43b0f8..901b3bee 100644 --- a/ripcd/btss82.cpp +++ b/ripcd/btss82.cpp @@ -67,11 +67,9 @@ BtSs82::BtSs82(RDMatrix *matrix,QObject *parent,const char *name) // Interval OneShots // bt_gpi_oneshot=new RDOneShot(this); - connect(bt_gpi_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpiOneshotData(void*))); + connect(bt_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int))); bt_gpo_oneshot=new RDOneShot(this); - connect(bt_gpo_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpoOneshotData(void*))); + connect(bt_gpo_oneshot,SIGNAL(timeout(int)),this,SLOT(gpoOneshotData(int))); // // The Poll Timer @@ -190,13 +188,13 @@ void BtSs82::processCommand(RDMacro *cmd) bt_gpi_state[cmd->arg(2).toInt()-1]=true; } bt_gpi_mask[cmd->arg(2).toInt()-1]=true; - bt_gpi_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpi_oneshot->start(cmd->arg(2).toInt()-1,500); } if(cmd->arg(1).toString().lower()=="o") { sprintf(str,"*%dOR%dP",BTSS82_UNIT_ID,cmd->arg(2).toInt()); bt_device->writeBlock(str,6); emit gpoChanged(bt_matrix,cmd->arg(2).toInt()-1,true); - bt_gpo_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + bt_gpo_oneshot->start(cmd->arg(2).toInt()-1,500); } } } @@ -384,20 +382,21 @@ void BtSs82::processStatus() default: bt_istate=0; + break; } } } } -void BtSs82::gpiOneshotData(void *data) +void BtSs82::gpiOneshotData(int value) { - bt_gpi_mask[(long)data]=false; + bt_gpi_mask[value]=false; bt_device->writeBlock("*0SPA",5); } -void BtSs82::gpoOneshotData(void *data) +void BtSs82::gpoOneshotData(int value) { - emit gpoChanged(bt_matrix,(long)data,false); + emit gpoChanged(bt_matrix,value,false); } diff --git a/ripcd/btss82.h b/ripcd/btss82.h index 101a8dac..f326b9ef 100644 --- a/ripcd/btss82.h +++ b/ripcd/btss82.h @@ -50,8 +50,8 @@ class BtSs82 : public Switcher private slots: void processStatus(); - void gpiOneshotData(void *data); - void gpoOneshotData(void *data); + void gpiOneshotData(int value); + void gpoOneshotData(int value); private: RDTTYDevice *bt_device; diff --git a/ripcd/livewire_mcastgpio.cpp b/ripcd/livewire_mcastgpio.cpp index fada5168..f13832a0 100644 --- a/ripcd/livewire_mcastgpio.cpp +++ b/ripcd/livewire_mcastgpio.cpp @@ -327,10 +327,10 @@ void LiveWireMcastGpio::ProcessGpo(int chan,unsigned line,bool state) (const char *)QHostAddress(ntohl(sa.sin_addr.s_addr)).toString()); */ - char data[28]={0x03,0x00,0x02,0x07,0xC6,0x04,0x55,0x1E, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 'I','N','D','I',0x00,0x01,0x00,0x00, - 0x00,0x00,0x07,0x00}; + uint8_t data[28]={0x03,0x00,0x02,0x07,0xC6,0x04,0x55,0x1E, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 'I','N','D','I',0x00,0x01,0x00,0x00, + 0x00,0x00,0x07,0x00}; data[4]=0xFF&(livewire_gpio_send_serial>>24); data[5]=0xFF&(livewire_gpio_send_serial>>16); data[6]=0xFF&(livewire_gpio_send_serial>>8); diff --git a/ripcd/local_gpio.cpp b/ripcd/local_gpio.cpp index 8ef81eb0..7733b8d8 100644 --- a/ripcd/local_gpio.cpp +++ b/ripcd/local_gpio.cpp @@ -64,8 +64,7 @@ LocalGpio::LocalGpio(RDMatrix *matrix,QObject *parent,const char *name) // Interval OneShot // gpio_gpi_oneshot=new RDOneShot(this); - connect(gpio_gpi_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpiOneshotData(void*))); + connect(gpio_gpi_oneshot,SIGNAL(timeout(int)),this,SLOT(gpiOneshotData(int))); } @@ -126,7 +125,7 @@ void LocalGpio::processCommand(RDMacro *cmd) gpio_gpi_mask[cmd->arg(2).toInt()-1]=true; if(cmd->arg(4).toInt()>0) { gpio_gpi_oneshot-> - start((void *)(cmd->arg(2).toInt()-1),cmd->arg(4).toInt()); + start(cmd->arg(2).toInt()-1,cmd->arg(4).toInt()); } } else { @@ -135,11 +134,11 @@ void LocalGpio::processCommand(RDMacro *cmd) gpio_gpi_mask[cmd->arg(2).toInt()-1]=true; if(cmd->arg(4).toInt()>0) { gpio_gpi_oneshot-> - start((void *)(cmd->arg(2).toInt()-1),cmd->arg(4).toInt()); + start(cmd->arg(2).toInt()-1,cmd->arg(4).toInt()); } } else { - gpiOneshotData((void *)(cmd->arg(2).toInt()-1)); + gpiOneshotData(cmd->arg(2).toInt()-1); } } cmd->acknowledge(true); @@ -186,8 +185,8 @@ void LocalGpio::gpoChangedData(int line,bool state) } -void LocalGpio::gpiOneshotData(void *data) +void LocalGpio::gpiOneshotData(int value) { - gpio_gpi_mask[(long)data]=false; - gpiChangedData((long)data,gpio_gpio->inputState((long)data)); + gpio_gpi_mask[value]=false; + gpiChangedData(value,gpio_gpio->inputState(value)); } diff --git a/ripcd/local_gpio.h b/ripcd/local_gpio.h index 84f5374f..97d9dfd2 100644 --- a/ripcd/local_gpio.h +++ b/ripcd/local_gpio.h @@ -47,7 +47,7 @@ class LocalGpio : public Switcher private slots: void gpiChangedData(int line,bool state); void gpoChangedData(int line,bool state); - void gpiOneshotData(void *data); + void gpiOneshotData(int value); private: RDGpio *gpio_gpio; diff --git a/ripcd/sas64000gpi.cpp b/ripcd/sas64000gpi.cpp index 0033bf85..31d11e8f 100644 --- a/ripcd/sas64000gpi.cpp +++ b/ripcd/sas64000gpi.cpp @@ -57,8 +57,8 @@ Sas64000Gpi::Sas64000Gpi(RDMatrix *matrix,QObject *parent,const char *name) // Interval OneShots // sas_gpo_oneshot=new RDOneShot(this); - connect(sas_gpo_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpoOneshotData(void*))); + connect(sas_gpo_oneshot,SIGNAL(timeout(int value)), + this,SLOT(gpoOneshotData(int))); } @@ -147,7 +147,7 @@ void Sas64000Gpi::processCommand(RDMacro *cmd) return; } cmd_byte=0xFB; - sas_gpo_oneshot->start((void *)(cmd->arg(2).toInt()-1),500); + sas_gpo_oneshot->start(cmd->arg(2).toInt()-1,500); emit gpoChanged(sas_matrix,cmd->arg(2).toInt()-1,true); } sprintf(str,"%c%c\xFF",cmd_byte,cmd->arg(2).toInt()-1); @@ -164,7 +164,7 @@ void Sas64000Gpi::processCommand(RDMacro *cmd) } -void Sas64000Gpi::gpoOneshotData(void *data) +void Sas64000Gpi::gpoOneshotData(int value) { - emit gpoChanged(sas_matrix,(long)data,false); + emit gpoChanged(sas_matrix,value,false); } diff --git a/ripcd/sas64000gpi.h b/ripcd/sas64000gpi.h index 5c6da279..e0c96645 100644 --- a/ripcd/sas64000gpi.h +++ b/ripcd/sas64000gpi.h @@ -46,7 +46,7 @@ class Sas64000Gpi : public Switcher void processCommand(RDMacro *cmd); private slots: - void gpoOneshotData(void *data); + void gpoOneshotData(int value); private: RDTTYDevice *sas_device; diff --git a/ripcd/vguest.cpp b/ripcd/vguest.cpp index ada1628a..125875ff 100644 --- a/ripcd/vguest.cpp +++ b/ripcd/vguest.cpp @@ -202,8 +202,8 @@ VGuest::VGuest(RDMatrix *matrix,QObject *parent,const char *name) // Interval OneShots // vguest_gpio_oneshot=new RDOneShot(this); - connect(vguest_gpio_oneshot,SIGNAL(timeout(void *)), - this,SLOT(gpioOneshotData(void*))); + connect(vguest_gpio_oneshot,SIGNAL(timeout(int)), + this,SLOT(gpioOneshotData(int))); // // Initialize the connection @@ -394,7 +394,7 @@ void VGuest::processCommand(RDMacro *cmd) SendCommand(buffer,9); emit gpiChanged(vguest_matrix,cmd->arg(2).toInt()-1,true); emit gpoChanged(vguest_matrix,cmd->arg(2).toInt()-1,true); - vguest_gpio_oneshot->start((void *)(cmd->arg(2).toInt()-1),2000); + vguest_gpio_oneshot->start(cmd->arg(2).toInt()-1,2000); break; case 0x52: @@ -555,10 +555,10 @@ void VGuest::errorData(int err,int id) } -void VGuest::gpioOneshotData(void *data) +void VGuest::gpioOneshotData(int value) { - emit gpiChanged(vguest_matrix,(long)data,false); - emit gpoChanged(vguest_matrix,(long)data,false); + emit gpiChanged(vguest_matrix,value,false); + emit gpoChanged(vguest_matrix,value,false); } diff --git a/ripcd/vguest.h b/ripcd/vguest.h index 72294927..9d99ac55 100644 --- a/ripcd/vguest.h +++ b/ripcd/vguest.h @@ -65,7 +65,7 @@ class VGuest : public Switcher void connectionClosedData(int id); void readyReadData(int id); void errorData(int err,int id); - void gpioOneshotData(void *data); + void gpioOneshotData(int value); void pingData(int id); void pingResponseData(int id); diff --git a/utils/rdgen/wavlib.c b/utils/rdgen/wavlib.c index 71ec0827..03d337ee 100644 --- a/utils/rdgen/wavlib.c +++ b/utils/rdgen/wavlib.c @@ -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 diff --git a/utils/rdhpiinfo/rdhpiinfo.cpp b/utils/rdhpiinfo/rdhpiinfo.cpp index c9db9b66..86b90a27 100644 --- a/utils/rdhpiinfo/rdhpiinfo.cpp +++ b/utils/rdhpiinfo/rdhpiinfo.cpp @@ -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=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); } diff --git a/web/rdxport/export.cpp b/web/rdxport/export.cpp index 271f9fab..e31692b2 100644 --- a/web/rdxport/export.cpp +++ b/web/rdxport/export.cpp @@ -2,9 +2,7 @@ // // Rivendell web service portal -- Export service // -// (C) Copyright 2010 Fred Gleason -// -// $Id: export.cpp,v 1.6.2.2 2013/10/02 18:25:12 cvs Exp $ +// (C) Copyright 2010,2014 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -172,6 +170,9 @@ void Xport::Export() } } close(fd); + unlink(tmpfile); + rmdir(tmpdir); + Exit(0); break; case RDAudioConvert::ErrorFormatNotSupported: @@ -198,5 +199,5 @@ void Xport::Export() } unlink(tmpfile); rmdir(tmpdir); - exit(0); + Exit(resp_code); } diff --git a/web/rdxport/rdxport.h b/web/rdxport/rdxport.h index 635ec250..cf556ebb 100644 --- a/web/rdxport/rdxport.h +++ b/web/rdxport/rdxport.h @@ -2,9 +2,7 @@ // // Rivendell web service portal // -// (C) Copyright 2010 Fred Gleason -// -// $Id: rdxport.h,v 1.7.2.3 2013/10/14 04:23:54 cvs Exp $ +// (C) Copyright 2010,2014 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as