mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2026-01-11 15:16:07 +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:
@@ -4,8 +4,6 @@
|
||||
//
|
||||
// (C) Copyright 2008 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// $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<int,QTimer *>::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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user