DeforaOS/Camera
DeforaOS/Camera
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DeforaOS:khorben/mmap
Branches Tags
DeforaOS:master
DeforaOS:khorben/mmap
DeforaOS:khorben/cairo
DeforaOS:khorben/gtk3
DeforaOS:Camera_0-3-1
DeforaOS:Camera_0-3-0
DeforaOS:Camera_0-2-0
DeforaOS:Camera_0-1-0
DeforaOS:Camera_0-0-1
DeforaOS:Camera_0-0-0
..
compare: DeforaOS:master
Branches Tags
DeforaOS:master
DeforaOS:khorben/mmap
DeforaOS:khorben/cairo
DeforaOS:khorben/gtk3
DeforaOS:Camera_0-3-1
DeforaOS:Camera_0-3-0
DeforaOS:Camera_0-2-0
DeforaOS:Camera_0-1-0
DeforaOS:Camera_0-0-1
DeforaOS:Camera_0-0-0

5 Commits
khorben/mm ... master

Author SHA1 Message Date
Pierre Pronchery
e3de8157ed po: update the translations 2025-02-20 17:47:27 +01:00
Pierre Pronchery
8d2931f8ea About to release DeforaOS Camera 0.3.1 2025-02-20 17:38:33 +01:00
Pierre Pronchery
88701c479b camera: make comments more consistent 2024-09-04 18:35:26 +02:00
Pierre Pronchery
9e855dad62 camera: allow the window to be resized smaller 2024-09-04 18:20:48 +02:00
Pierre Pronchery
3b5399a8d2 Merge branch 'khorben/mmap' 2024-09-04 18:19:37 +02:00
5 changed files with 48 additions and 50 deletions
Show Stats Expand all files Collapse all files

50
po/es.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Camera 0.1.0\n" "Project-Id-Version: Camera 0.3.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-01-23 20:01+0100\n" "POT-Creation-Date: 2024-07-30 02:46+0200\n"
"PO-Revision-Date: 2015-02-16 07:20+0100\n" "PO-Revision-Date: 2025-02-20 17:45+0100\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Spanish\n" "Language-Team: Spanish\n"
"Language: es\n" "Language: es\n"
@ -23,7 +23,7 @@ msgstr ""
#: ../src/camera.c:216 #: ../src/camera.c:216
msgid "Gallery" msgid "Gallery"
msgstr "" msgstr "Galería"
#: ../src/camera.c:220 ../src/camera.c:227 ../src/camera.c:899 #: ../src/camera.c:220 ../src/camera.c:227 ../src/camera.c:899
#: ../src/camera.c:909 #: ../src/camera.c:909
@ -36,7 +36,7 @@ msgstr "Preferencias"
#: ../src/camera.c:303 #: ../src/camera.c:303
msgid "Fullscreen" msgid "Fullscreen"
msgstr "" msgstr "Pantalla completa"
#: ../src/camera.c:701 #: ../src/camera.c:701
msgid "Nearest" msgid "Nearest"
@ -72,7 +72,7 @@ msgstr ""
#: ../src/camera.c:759 #: ../src/camera.c:759
msgid "Picture" msgid "Picture"
msgstr "" msgstr "Imagen"
#: ../src/camera.c:765 #: ../src/camera.c:765
msgid "Format: " msgid "Format: "
@ -102,65 +102,65 @@ msgstr ""
msgid "Capabilities: " msgid "Capabilities: "
msgstr "" msgstr ""
#: ../src/camera.c:1005 ../src/camera.c:1009 ../src/camera.c:1028 #: ../src/camera.c:1005 ../src/camera.c:1009 ../src/camera.c:1029
#: ../src/camera.c:1047 ../src/camera.c:1073 ../src/camera.c:1093 #: ../src/camera.c:1048 ../src/camera.c:1074 ../src/camera.c:1094
#: ../src/camera.c:1246 #: ../src/camera.c:1247
msgid "Could not save picture" msgid "Could not save picture"
msgstr "" msgstr ""
#: ../src/camera.c:1095 #: ../src/camera.c:1096
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
#: ../src/camera.c:1199 ../src/camera.c:1203 #: ../src/camera.c:1200 ../src/camera.c:1204
msgid "Error" msgid "Error"
msgstr "Error" msgstr "Error"
#: ../src/camera.c:1432 #: ../src/camera.c:1433
msgid "Could not open the video capture device" msgid "Could not open the video capture device"
msgstr "" msgstr ""
#: ../src/camera.c:1473 #: ../src/camera.c:1474
msgid "Could not obtain the capabilities" msgid "Could not obtain the capabilities"
msgstr "" msgstr ""
#: ../src/camera.c:1477 #: ../src/camera.c:1478
msgid "Not a video capture device" msgid "Not a video capture device"
msgstr "" msgstr ""
#: ../src/camera.c:1490 #: ../src/camera.c:1491
msgid "Cropping not supported" msgid "Cropping not supported"
msgstr "" msgstr ""
#: ../src/camera.c:1495 #: ../src/camera.c:1497
msgid "Could not obtain the video capture format" msgid "Could not obtain the video capture format"
msgstr "" msgstr ""
#: ../src/camera.c:1499 #: ../src/camera.c:1501
msgid "Unsupported video capture type" msgid "Unsupported video capture type"
msgstr "" msgstr ""
#: ../src/camera.c:1510 #: ../src/camera.c:1512
msgid "Unsupported capabilities" msgid "Unsupported capabilities"
msgstr "" msgstr ""
#: ../src/camera.c:1545 #: ../src/camera.c:1547
msgid "Could not request buffers" msgid "Could not request buffers"
msgstr "" msgstr ""
#: ../src/camera.c:1548 #: ../src/camera.c:1550
msgid "Could not obtain enough buffers" msgid "Could not obtain enough buffers"
msgstr "" msgstr ""
#: ../src/camera.c:1552 #: ../src/camera.c:1554
msgid "Could not allocate buffers" msgid "Could not allocate buffers"
msgstr "" msgstr ""
#: ../src/camera.c:1568 #: ../src/camera.c:1570
msgid "Could not setup buffers" msgid "Could not setup buffers"
msgstr "" msgstr ""
#: ../src/camera.c:1574 #: ../src/camera.c:1576
msgid "Could not map buffers" msgid "Could not map buffers"
msgstr "" msgstr ""
@ -201,7 +201,7 @@ msgstr "_Preferencias"
#: ../src/window.c:132 #: ../src/window.c:132
msgid "_Fullscreen" msgid "_Fullscreen"
msgstr "" msgstr "_Pantalla completa"
#: ../src/window.c:143 #: ../src/window.c:143
msgid "_Contents" msgid "_Contents"
@ -233,7 +233,7 @@ msgstr ""
#: ../src/window.c:202 #: ../src/window.c:202
msgid "Camera" msgid "Camera"
msgstr "" msgstr "Cámara"
#: ../src/window.c:422 #: ../src/window.c:422
msgid "Simple webcam application for the DeforaOS desktop" msgid "Simple webcam application for the DeforaOS desktop"

40
po/fr.po
View File

@ -5,10 +5,10 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Camera 0.1.0\n" "Project-Id-Version: Camera 0.3.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-01-23 20:01+0100\n" "POT-Creation-Date: 2024-07-30 02:46+0200\n"
"PO-Revision-Date: 2013-01-18 22:31+0100\n" "PO-Revision-Date: 2025-02-20 17:45+0100\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n" "Language-Team: French\n"
"Language: fr\n" "Language: fr\n"
@ -102,65 +102,65 @@ msgstr "Version : "
msgid "Capabilities: " msgid "Capabilities: "
msgstr "Capacités : " msgstr "Capacités : "
#: ../src/camera.c:1005 ../src/camera.c:1009 ../src/camera.c:1028 #: ../src/camera.c:1005 ../src/camera.c:1009 ../src/camera.c:1029
#: ../src/camera.c:1047 ../src/camera.c:1073 ../src/camera.c:1093 #: ../src/camera.c:1048 ../src/camera.c:1074 ../src/camera.c:1094
#: ../src/camera.c:1246 #: ../src/camera.c:1247
msgid "Could not save picture" msgid "Could not save picture"
msgstr "Impossible d'enregistrer l'image" msgstr "Impossible d'enregistrer l'image"
#: ../src/camera.c:1095 #: ../src/camera.c:1096
msgid "Unknown error" msgid "Unknown error"
msgstr "Erreur inconnue" msgstr "Erreur inconnue"
#: ../src/camera.c:1199 ../src/camera.c:1203 #: ../src/camera.c:1200 ../src/camera.c:1204
msgid "Error" msgid "Error"
msgstr "Erreur" msgstr "Erreur"
#: ../src/camera.c:1432 #: ../src/camera.c:1433
msgid "Could not open the video capture device" msgid "Could not open the video capture device"
msgstr "Impossible d'ouvrir le périphérique de capture vidéo" msgstr "Impossible d'ouvrir le périphérique de capture vidéo"
#: ../src/camera.c:1473 #: ../src/camera.c:1474
msgid "Could not obtain the capabilities" msgid "Could not obtain the capabilities"
msgstr "Impossible d'obtenir les capacités" msgstr "Impossible d'obtenir les capacités"
#: ../src/camera.c:1477 #: ../src/camera.c:1478
msgid "Not a video capture device" msgid "Not a video capture device"
msgstr "Pas de périphérique de capture vidéo" msgstr "Pas de périphérique de capture vidéo"
#: ../src/camera.c:1490 #: ../src/camera.c:1491
msgid "Cropping not supported" msgid "Cropping not supported"
msgstr "Recadrage non supporté" msgstr "Recadrage non supporté"
#: ../src/camera.c:1495 #: ../src/camera.c:1497
msgid "Could not obtain the video capture format" msgid "Could not obtain the video capture format"
msgstr "Impossible d'obtenir le format de capture vidéo" msgstr "Impossible d'obtenir le format de capture vidéo"
#: ../src/camera.c:1499 #: ../src/camera.c:1501
msgid "Unsupported video capture type" msgid "Unsupported video capture type"
msgstr "Type de capture vidéo non supporté" msgstr "Type de capture vidéo non supporté"
#: ../src/camera.c:1510 #: ../src/camera.c:1512
msgid "Unsupported capabilities" msgid "Unsupported capabilities"
msgstr "Capacités non supportées" msgstr "Capacités non supportées"
#: ../src/camera.c:1545 #: ../src/camera.c:1547
msgid "Could not request buffers" msgid "Could not request buffers"
msgstr "Impossible de demander le cache" msgstr "Impossible de demander le cache"
#: ../src/camera.c:1548 #: ../src/camera.c:1550
msgid "Could not obtain enough buffers" msgid "Could not obtain enough buffers"
msgstr "Impossible d'obtenir suffisamment de cache" msgstr "Impossible d'obtenir suffisamment de cache"
#: ../src/camera.c:1552 #: ../src/camera.c:1554
msgid "Could not allocate buffers" msgid "Could not allocate buffers"
msgstr "Impossible d'allouer le cache" msgstr "Impossible d'allouer le cache"
#: ../src/camera.c:1568 #: ../src/camera.c:1570
msgid "Could not setup buffers" msgid "Could not setup buffers"
msgstr "Impossible de configurer le cache" msgstr "Impossible de configurer le cache"
#: ../src/camera.c:1574 #: ../src/camera.c:1576
msgid "Could not map buffers" msgid "Could not map buffers"
msgstr "Impossible d'étaler le cache" msgstr "Impossible d'étaler le cache"

2
project.conf
View File

@ -1,5 +1,5 @@
package=Camera package=Camera
version=0.3.0 version=0.3.1
vendor=Desktop vendor=Desktop
config=h,sh config=h,sh

5
src/camera.c
View File

@ -1533,9 +1533,6 @@ static gboolean _camera_on_open(gpointer data)
gtk_widget_set_sensitive( gtk_widget_set_sensitive(
GTK_WIDGET(_camera_toolbar[CT_PROPERTIES].widget), GTK_WIDGET(_camera_toolbar[CT_PROPERTIES].widget),
TRUE); TRUE);
/* FIXME allow the window to be smaller */
gtk_widget_set_size_request(camera->area, camera->format.fmt.pix.width,
camera->format.fmt.pix.height);
return FALSE; return FALSE;
} }
@ -1714,7 +1711,7 @@ static int _open_setup_read(Camera * camera)
strerror(errno)); strerror(errno));
camera->raw_buffer = p; camera->raw_buffer = p;
camera->raw_buffer_cnt = cnt; camera->raw_buffer_cnt = cnt;
/* allocate the rgb buffer */ /* allocate the RGB buffer */
cnt = camera->format.fmt.pix.width * camera->format.fmt.pix.height * 3; cnt = camera->format.fmt.pix.width * camera->format.fmt.pix.height * 3;
if((p = realloc(camera->rgb_buffer, cnt)) == NULL) if((p = realloc(camera->rgb_buffer, cnt)) == NULL)
return error_set_code(-errno, "%s: %s", camera->device, return error_set_code(-errno, "%s: %s", camera->device,

1
src/window.c
View File

@ -201,6 +201,7 @@ CameraWindow * camerawindow_new(char const * device)
# endif # endif
gtk_window_set_title(GTK_WINDOW(camera->window), _("Camera")); gtk_window_set_title(GTK_WINDOW(camera->window), _("Camera"));
#endif #endif
gtk_window_set_default_size(GTK_WINDOW(camera->window), 640, 480);
g_signal_connect_swapped(camera->window, "delete-event", G_CALLBACK( g_signal_connect_swapped(camera->window, "delete-event", G_CALLBACK(
_camerawindow_on_closex), camera); _camerawindow_on_closex), camera);
g_signal_connect(camera->window, "window-state-event", G_CALLBACK( g_signal_connect(camera->window, "window-state-event", G_CALLBACK(