diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/uca-camera.c | 10 | ||||
| -rw-r--r-- | src/uca-camera.h | 2 | ||||
| -rw-r--r-- | src/uca-docs.xml.in | 4 | ||||
| -rw-r--r-- | src/uca-plugin-manager.c | 21 | ||||
| -rw-r--r-- | src/uca.types.in | 2 |
6 files changed, 32 insertions, 20 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dd2f464..160c52b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -130,6 +130,7 @@ if(GTK_DOC_FOUND) "${docs_out}/api-index-full.html" "${docs_out}/ch01.html" "${docs_out}/UcaCamera.html" + "${docs_out}/UcaPluginManager.html" "${docs_out}/style.css" "${docs_out}/uca.devhelp2" "${docs_out}/home.png" @@ -137,18 +138,6 @@ if(GTK_DOC_FOUND) "${docs_out}/right.png" "${docs_out}/up.png") - # Put in uca-docs.xml and uca.types all cameras that are built - set(_xml_doc_input) - set(_types_input) - foreach (_cam ${cameras}) - # add camera to the installed documentation - list(APPEND reference_files "${docs_out}/Uca${_cam}Camera.html") - - string(TOLOWER ${_cam} _cam) - set(_xml_doc_input "${_xml_doc_input}\n<xi:include href=\"xml/uca-${_cam}-camera.xml\"/>") - set(_types_input "${_types_input}\nuca_${_cam}_camera_get_type") - endforeach() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/uca-docs.xml.in ${docs_out}/uca-docs.xml) diff --git a/src/uca-camera.c b/src/uca-camera.c index 14da820..6d92e6a 100644 --- a/src/uca-camera.c +++ b/src/uca-camera.c @@ -15,6 +15,14 @@ with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA */ +/** + * SECTION:uca-camera + * @Short_description: Base class representing a camera + * @Title: UcaCamera + * + * UcaCamera is the base camera from which a real hardware camera derives from. + */ + #include <glib.h> #include "config.h" #include "uca-camera.h" @@ -28,7 +36,7 @@ G_DEFINE_TYPE(UcaCamera, uca_camera, G_TYPE_OBJECT) * UcaCameraTrigger: * @UCA_CAMERA_TRIGGER_AUTO: Trigger automatically * @UCA_CAMERA_TRIGGER_EXTERNAL: Trigger from an external source - * @UCA_CAMERA_TRIGGER_INTERNAL: Trigger internally from software using + * @UCA_CAMERA_TRIGGER_SOFTWARE: Trigger from software using * #uca_camera_trigger */ diff --git a/src/uca-camera.h b/src/uca-camera.h index 7d81dac..8bc48bc 100644 --- a/src/uca-camera.h +++ b/src/uca-camera.h @@ -42,7 +42,7 @@ typedef enum { typedef enum { UCA_CAMERA_TRIGGER_AUTO, - UCA_CAMERA_TRIGGER_INTERNAL, + UCA_CAMERA_TRIGGER_SOFTWARE, UCA_CAMERA_TRIGGER_EXTERNAL } UcaCameraTrigger; diff --git a/src/uca-docs.xml.in b/src/uca-docs.xml.in index 43a830d..093fd36 100644 --- a/src/uca-docs.xml.in +++ b/src/uca-docs.xml.in @@ -16,8 +16,8 @@ <chapter> <title>Unified Camera Access</title> - <xi:include href="xml/uca-camera.xml"/> - ${_xml_doc_input} + <xi:include href="xml/uca-camera.xml"/> + <xi:include href="xml/uca-plugin-manager.xml"/> </chapter> <index id="api-index-full"> diff --git a/src/uca-plugin-manager.c b/src/uca-plugin-manager.c index cb7e518..373ccb2 100644 --- a/src/uca-plugin-manager.c +++ b/src/uca-plugin-manager.c @@ -1,3 +1,20 @@ +/* Copyright (C) 2012 Matthias Vogelgesang <matthias.vogelgesang@kit.edu> + (Karlsruhe Institute of Technology) + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2.1 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + details. + + You should have received a copy of the GNU Lesser General Public License along + with this library; if not, write to the Free Software Foundation, Inc., 51 + Franklin St, Fifth Floor, Boston, MA 02110, USA */ + /** * SECTION:uca-plugin-manager * @Short_description: Load an #UcaFilter from a shared object @@ -47,7 +64,6 @@ uca_plugin_manager_error_quark (void) /** * uca_plugin_manager_new: - * @config: (allow-none): A #UcaConfiguration object or %NULL. * * Create a plugin manager object to instantiate camera objects. * @@ -142,10 +158,9 @@ list_free_full (GList *list) /** * uca_plugin_manager_get_available_cameras: - * * @manager: A #UcaPluginManager * - * Returns: (element-type utf8) (transfer full): A list with strings of + * Return value: (element-type utf8) (transfer full): A list with strings of * available camera names. You have to free the individual strings with * g_list_foreach(list, (GFunc) g_free, NULL) and the list itself with * g_list_free. diff --git a/src/uca.types.in b/src/uca.types.in index a9ce408..7526948 100644 --- a/src/uca.types.in +++ b/src/uca.types.in @@ -1,2 +1,2 @@ uca_camera_get_type -${_types_input} +uca_plugin_manager_get_type |