[GEM-cvs] SF.net SVN: pd-gem:[3924] trunk/Gem/src/plugins/videoDC1394/videoDC1394.cpp
Brought to you by:
zmoelnig
From: <zmo...@us...> - 2011-04-18 13:09:12
|
Revision: 3924 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=3924&view=rev Author: zmoelnig Date: 2011-04-18 13:09:06 +0000 (Mon, 18 Apr 2011) Log Message: ----------- use 'channel' rather than 'isochannel' likewise for 'speed' rather than 'isospeed' Modified Paths: -------------- trunk/Gem/src/plugins/videoDC1394/videoDC1394.cpp Modified: trunk/Gem/src/plugins/videoDC1394/videoDC1394.cpp =================================================================== --- trunk/Gem/src/plugins/videoDC1394/videoDC1394.cpp 2011-04-18 13:08:36 UTC (rev 3923) +++ trunk/Gem/src/plugins/videoDC1394/videoDC1394.cpp 2011-04-18 13:09:06 UTC (rev 3924) @@ -426,12 +426,12 @@ readable .set(key, type); writeable.set(key, type); - key="isospeed"; type=0; + key="speed"; type=0; readable .set(key, type); writeable.set(key, type); - key="isochannel"; type=0; - readable .set(key, type); + key="channel"; type=0; + readable .set(key, type); writeable.set(key, type); key="transmission"; type=0; @@ -531,12 +531,12 @@ default: continue; } props.set(key, svalue); - } else if("isospeed" == key) { + } else if("speed" == key) { dc1394speed_t speed; DC1394_TRYGET(iso_speed(m_dccamera, &speed)); value=100*(1<<speed); props.set(key, value); - } else if("isochannel" == key) { + } else if("channel" == key) { uint32_t channel; DC1394_TRYGET(iso_channel(m_dccamera, &channel)); value=channel; @@ -645,7 +645,7 @@ err=dc1394_video_set_operation_mode(m_dccamera, mode); - } else if("isospeed" == key) { + } else if("speed" == key) { dc1394speed_t speed=DC1394_ISO_SPEED_MIN; if (props.get(key, value) && value>0) { @@ -657,7 +657,7 @@ err=dc1394_video_set_iso_speed(m_dccamera, speed); } - } else if("isochannel" == key) { + } else if("channel" == key) { if (props.get(key, value) && value>=0) { uint32_t channel=value; err=dc1394_video_set_iso_channel(m_dccamera, channel); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |