Compare commits

..

No commits in common. "master" and "khorben/mmap" have entirely different histories.

5 changed files with 50 additions and 48 deletions

View File

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

View File

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

View File

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

View File

@ -1533,6 +1533,9 @@ static gboolean _camera_on_open(gpointer data)
gtk_widget_set_sensitive(
GTK_WIDGET(_camera_toolbar[CT_PROPERTIES].widget),
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;
}
@ -1711,7 +1714,7 @@ static int _open_setup_read(Camera * camera)
strerror(errno));
camera->raw_buffer = p;
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;
if((p = realloc(camera->rgb_buffer, cnt)) == NULL)
return error_set_code(-errno, "%s: %s", camera->device,

View File

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