Revision: 6736
http://playerstage.svn.sourceforge.net/playerstage/?rev=6736&view=rev
Author: natepak
Date: 2008-07-02 13:08:51 -0700 (Wed, 02 Jul 2008)
Log Message:
-----------
Camera1394 with dc1394-v2 now uses the Node player config parameter
Modified Paths:
--------------
code/player/trunk/server/drivers/camera/1394/camera1394.cc
Modified: code/player/trunk/server/drivers/camera/1394/camera1394.cc
===================================================================
--- code/player/trunk/server/drivers/camera/1394/camera1394.cc 2008-07-02
19:49:20 UTC (rev 6735)
+++ code/player/trunk/server/drivers/camera/1394/camera1394.cc 2008-07-02
20:08:51 UTC (rev 6736)
@@ -774,9 +774,23 @@
return -1;
}
- // we just use the first one returned and then free the rest
- camera = dc1394_camera_new (d, list->ids[0].guid);
+ for (int i=0; i < list->num; i++)
+ {
+ uint32_t camNode, camGeneration;
+ // Create a camera
+ this->camera = dc1394_camera_new (d, list->ids[this->node].guid);
+
+ // Get the node of the camera
+ dc1394_camera_get_node(this->camera, &camNode, &camGeneration);
+
+ // Make sure we have the correct camera
+ if (camNode == this->node)
+ break;
+ else
+ dc1394_camera_free(this->camera);
+ }
+
if (!camera)
{
PLAYER_ERROR1("Failed to initialize camera with guid %llx",
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
