Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +02:00
Code Issues Projects Releases Wiki Activity

2014-08-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* 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:
Fred Gleason
2014-08-14 19:08:38 -04:00
parent e02e625950
commit 89b846f7d6
63 changed files with 423 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ripcd/local_gpio.cpp
View File

@@ -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));
}