Author: abrander
Date: 2012-07-08 14:44:57 +0200 (Sun, 08 Jul 2012)
New Revision: 4239
Modified:
trunk/src/rs-tethered-shooting.c
Log:
Do more complete initialization in open_camera().
Modified: trunk/src/rs-tethered-shooting.c
===================================================================
--- trunk/src/rs-tethered-shooting.c 2012-07-08 11:03:38 UTC (rev 4238)
+++ trunk/src/rs-tethered-shooting.c 2012-07-08 12:44:57 UTC (rev 4239)
@@ -373,6 +373,12 @@
CHECKRETVAL(ret);
/* First lookup the model / driver */
+ ret = gp_abilities_list_new(&abilities);
+ CHECKRETVAL(ret);
+
+ ret = gp_abilities_list_load(abilities, t->context);
+ CHECKRETVAL(ret);
+
m = gp_abilities_list_lookup_model (abilities, model);
if (m < GP_OK)
return ret;
@@ -383,8 +389,16 @@
ret = gp_camera_set_abilities (*camera, a);
CHECKRETVAL(ret);
+ ret = gp_port_info_list_new(&portinfolist);
+ CHECKRETVAL(ret);
+
+ ret = gp_port_info_list_load(portinfolist);
+ CHECKRETVAL(ret);
+
/* Then associate the camera with the specified port */
p = gp_port_info_list_lookup_path (portinfolist, port);
+ CHECKRETVAL(p);
+
switch (p)
{
case GP_ERROR_UNKNOWN_PORT:
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
