aboutsummaryrefslogtreecommitdiffstats
path: root/src/callbacks.c
AgeCommit message (Collapse)AuthorFilesLines
2018-09-05callbacks: use a callback to draw at GtkDrawingAreagtk3_improvementsMauro Carvalho Chehab1-41/+62
Gtk 3 supports wayland, but there's a catch: while the current code works properly with X11, it doesn't draw anything inside the GtkDrawingArea on Wayland. The fix is trivial, but incompatible with Gtk2: instead of updating the drawing aea inside the main loop, a callback has to be used in order to handle gtk draw logic. As, at least for now, we want to keep supporting Gtk 2, let's add a compatibility code. That fixes drawing with Wayland. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-09-05callbacks: Optimize cairo logic for Gtk 3Mauro Carvalho Chehab1-2/+24
With Gtk 3, we don't need to implement the funtion gdk_cairo_surface_create_from_pixbuf() ourselves, as it is available there. So, just call the right function. Also, with Gtk 3.22 and above, the old way of calling gdk_cairo_create() is obsolete, as all windows already have it. So, instead, just instance it. That supresses a deprecated function warning: callbacks.c:604:5: warning: ‘gdk_cairo_create’ is deprecated: Use 'gdk_window_begin_draw_frame() and gdk_drawing_context_get_cairo_context()' instead [-Wdeprecated-declarations] cr = gdk_cairo_create(window); ^~ In file included from /usr/include/gtk-3.0/gdk/gdk.h:33, from /usr/include/gtk-3.0/gtk/gtk.h:30, from v4l.h:24, from callbacks.h:4, from callbacks.c:1: /usr/include/gtk-3.0/gdk/gdkcairo.h:35:12: note: declared here cairo_t * gdk_cairo_create (GdkWindow *window); ^~~~~~~~~~~~~~~~ While here, add a missing surface destroy in order to avoid possible memory leaks. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-09-04callbacks: don't print resolution by defaultMauro Carvalho Chehab1-1/+2
This is a debug message. Only print when needed. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-09-04callback: Fix some issues at the about dialogMauro Carvalho Chehab1-9/+9
The documenters dialog is useless, as there's about no Camorama documentation, and this was never used. Also, when the dialog is called, a warning is produced, because it doesn't find the right object. So, instead, implement a destroy callback. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-09-04Unify coding styleMauro Carvalho Chehab1-352/+346
The coding style of Camorama is a mess. It doesn't consistently follow the same style. Unify it by applying a coding style close to the Linux Kernel. There is an exception, however: here, we'll use indent with 4, and won't use tabs. Rationale for using the Kernel style: 1) The checkpatch.pl script there can do lots of cleanups; 2) There used to be a lindent line (with I still have here), with do several other style cleanups. So, most of the changes can happen on a more automatic way. Still, care should be taken with static constants, as Kernel initializes them with zeros, while userspace don't. Accidentally, I'm more familiar with this style, with makes easier for me to contribute :-D No functional changes. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-09-04callbacks: get rid of some dead codeMauro Carvalho Chehab1-6/+0
There are two warnings here related to some threshold filter. Well, the threshold filters are already modeled using the same way as the other filters. So, there's no need for an extra call there. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-09-04callbacks: fix the notification functionsMauro Carvalho Chehab1-6/+6
As warned by gcc, the way it is, those functions do nothing, as they're not passing a pointer to the data that should be updated. Fix them. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-09-04callbacks: get rid of unsused GconfClientMauro Carvalho Chehab1-52/+0
Those functions set the client, but never use it. Get rid of those dead code. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-09-04Do some code cleanupsMauro Carvalho Chehab1-32/+21
When building it with: CFLAGS="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=return-type" Lots of warning appear. Clean up the most trivial ones. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-09-04Centralize include for gtk 2Mauro Carvalho Chehab1-3/+2
With gtk 2, a function prototyle is declared on a wrong way. Depending on the gcc flags, this will produce an error: /usr/include/gtk-2.0/gtk/gtkitemfactory.h:47:1: error: function declaration isn’t a prototype [-Werror=strict-prototypes] So, move gtk.h include to v4l.h and ensure that this warning is disabled when including it. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-09-04Rename camera struct typedef from cam to cam_tMauro Carvalho Chehab1-36/+36
Depending on the gcc options, that causes a fatal warning: v4l.c:36:37: error: declaration of ‘cam’ shadows a global declaration [-Werror=shadow] static void insert_resolution(cam * cam, int x, int y) ~~~~~~^~~ In file included from v4l.c:6: v4l.h:99:3: note: shadowed declaration is here } cam; ^~~ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-09-03Fix some gcc warningsMauro Carvalho Chehab1-8/+4
Fedora tries to build it with: CFLAGS="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=return-type" With makes it hit some Werror conditions. Solve those and a bunch of random warnings. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-28Improvements and fixes (#17)0.20Mauro Carvalho Chehab1-139/+262
* Get rid of *~ backup files and autom4mate.cache/ It doesn't make sense to keep backup files stored on git. Update .gitignore accordingly and sort their entries. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Bug reports should be done at the github tree Not sure why it is listing gnome for bug report. I suspect it was because it was written originally to be part of Gnome. Update it to point to upstream's camorama repository at github, where bugs will likely be better handled. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Add a camorama.appdata.xml Use the file shipped with Fedora as basis, changing the screenshots (the link there is broken) and changing the email of the current maintainer. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * v4l: fix a typo enqueu -> enqueue Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Rename configure.in to configure.ac While here, update it according with: https://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * autogen.sh: use a more modern approach The procedure used there is deprecated. Change it to run with latest versions of Gtk 2. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Update build system Run the autogen.sh script to generate again the files that are created automatically. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Convert it to use the new gettext logic Since version 0.19.8, gettext doesn't need intltoolize anymore. Cleanup gettext logic, in order to auto-generate the po/* files. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Update auto-generated build files All those files can be generated by running the autogen.sh script. Yet, as camorama use to carry those for a while, let's auto-generate and keep them inside the tree, removing the obsolete ones and backup files. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * POFILES.in: add missing sources Several sources are missing at the POFILES.in. Update. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * callbacks: allow translating the fps streaming message Use gettext to allow translating this message: "%.2f fps - current %.2f fps - average" Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Auto-translate camera.desktop Add the needed logic to auto-translate camera.desktop. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Auto-translate camorama.appdata.xml Add locale translations for camorama.appdata.xml too. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Fix depth on filters and fileio V4L2 uses depth as bits per pixel, while filters and file io uses it as bits per byte. Do the conversion. Fixes a regression on Camorama filters. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * v4l: Better name V4L bits per pixel field At V4L, the depth for each video format is represented using bits per pixel. However, at Camorama, the filters use bytes per pixel instead. That caused a regression during the conversion to V4L2. In order to avoid further troubles, let's rename: cam->depth ===> cam->bpp Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * v4l: make print_cam() useful There is a debug logic at v4l.c that is not used anywhere. Also, its output is noisy, as it displays some things that shouldn't work if not explicitly set. Print data from it when -D is used, on a useful way, e. g. by default it will print something like: Camera Info ----------- device = /dev/video0, x = 960, y = 720 bits per pixel = 24, desk_depth = 24 capture directory = /home/user/Webcam_Pictures, capture file = Webcam Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Include only gtk.h header Instead of including header files just for a few widgets used, include the main one. That's a rule with Gtk 3. That also allows building it with: make CFLAGS+="-DGTK_DISABLE_SINGLE_INCLUDES" Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * filter: get rid of a warning due to a missing prototype filter.c: In function ‘camorama_filters_init’: filter.c:574:2: warning: implicit declaration of function ‘camorama_filter_reichardt_get_type’; did you mean ‘camorama_filter_invert_get_type’? [-Wimplicit-function-declaration] camorama_filter_reichardt_get_type(); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ camorama_filter_invert_get_type Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * fileio: use g_thread_new() instead of g_thread_create() fileio.c:226:9: warning: ‘g_thread_create’ is deprecated: Use 'g_thread_new' instead [-Wdeprecated-declarations] g_thread_create ((GThreadFunc) save_thread, cam, FALSE, NULL); ^~~~~~~~~~~~~~~ In file included from /usr/include/glib-2.0/glib.h:108, from /usr/include/glib-2.0/gobject/gbinding.h:28, from /usr/include/glib-2.0/glib-object.h:23, from /usr/include/glib-2.0/gio/gioenums.h:28, from /usr/include/glib-2.0/gio/giotypes.h:28, from /usr/include/glib-2.0/gio/gio.h:26, from /usr/include/gtk-2.0/gdk/gdkapplaunchcontext.h:30, from /usr/include/gtk-2.0/gdk/gdk.h:32, from /usr/include/gtk-2.0/gtk/gtk.h:32, from v4l.h:14, from fileio.h:1, from fileio.c:1: /usr/include/glib-2.0/glib/deprecated/gthread.h:104:10: note: declared here GThread *g_thread_create (GThreadFunc func, ^~~~~~~~~~~~~~~ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * stop using deprecated gdk_pixbuf_new_from_inline() Prevents this deprecated warning: camorama-stock-items.c:18:2: warning: ‘gdk_pixbuf_new_from_inline’ is deprecated [-Wdeprecated-declarations] GdkPixbuf* buf = gdk_pixbuf_new_from_inline(-1, inline_data, FALSE, NULL); ^~~~~~~~~ In file included from /usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h:34, from /usr/include/gtk-2.0/gdk/gdkpixbuf.h:37, from /usr/include/gtk-2.0/gdk/gdkcairo.h:28, from /usr/include/gtk-2.0/gdk/gdk.h:33, from /usr/include/gtk-2.0/gtk/gtk.h:32, from camorama-stock-items.c:8: /usr/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h:362:12: note: declared here GdkPixbuf* gdk_pixbuf_new_from_inline (gint data_length, ^~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * get rid of deprecated GTK_WIDGET_STATE() Use gtk_widget_get_state() instead. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Add labels for GNOMEUIINFO_MENU_* items glade-3 doesn't recognize GNOMEUIINFO_MENU_* stock_item anymore. So, we need labels. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * camorama.glade: use glade-3 to generate it It is a way easier to use glade-3 to change the interface. Now that it doesn't use the obsoleted stock item anymore, convert it to the format that glade-3 uses. It will produce one warning, though: [main_window:bonobodock1:vbox36:hbox25:frame1:da] Object class 'Custom widget' from gtk 2.16 is deprecated It should be noticed that glade-3 will add a "swapped attribute to all signals. Those will cause harmless warnings when camorama runs. In order to avoid, we just need to patch the file, after using glade-3 with hunks like this: - <signal name="activate" handler="on_show_effects_activate" swapped="no"/> + <signal name="activate" handler="on_show_effects_activate"/> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Replace custom widget by GtkDrawingArea There's no need to use a custom widget here. Just use a GtkDrawingArea and simplify the code. With such change, glade-3 doesn't complain anymore about the usage of obsolete widgets. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * camorama.glade: get rid of bonobo and GnomeApp Do some cleanup at camorama.glade in order to make it easier to convert later to Gtk 3 by removing bonobo-specific and GnomeApp widget dependencies. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Use GtkStatusbar instead of GnomeAppBar No need to use the gnome-specific widget. Just use the default Gtk one. That should make easier when converting this to Gtk 3. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Convert to Gtk Builder Instead of using libglade, use Gtk Builder. This removes one dependency from Camorama and makes easier to convert to Gtk 3. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Instead of gnome, use Gtk to display "about" information The gnome_about_new() function is deprecated. Convert it to use the Gtk about dialog instead, and add the license information to it. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * remove uneded includes from camorama-window.c, v4l.c and fileio.c Those headers aren't needed there, so remove them. While here, reorder includes to put into alphabetic order. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * camorama-stock-items: get rid of gnome-specific file location function The only reason why gnome.h is included here is due to a function to locate an icon file. On other parts of Camorama, PACKAGE_DATA_DIR is used, instead, in order o get a pixmap. So, standardize it, by doing the same way here. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * support: get rid of create_pixbuf() This function is not used anymore. Get rid of it. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * support: use Gtk dialog instead of the gnome one There's no good reason to use gnome-specific dialog message here. So, replace by the equivalent Gtk one. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * fileio: use gio instead of gnomeVFS and support sftp and smb The gnomeVFS is now obsolete. Replace it by gio. As a bonus, it now supports also sftp and smb protocols. While here, remove dead code inside fileio.c. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * fileio: fix a bug preventing timestamp to show on remote file When storing a remote file, the timestamp was not shown: Webcam-(null).jpeg That's because it was doing a sizeof(char *) instead of sizeof(char[str_len]). While here, get rid of the unused timenow var inside remote_save(). Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Only validate remote host settings if capture is enabled It doesn't make any sense to try to map to a remote host if capture is disabled. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * main: use gtk_init() instead of gnome_program_init() With that, camorama doesn't need to use libgnomeui-2.0 anymore. While here, update Gtk check logic to version 2.24, as it is needed in order to use the GtkComboBox. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Rename data/camorama.glade -> data/camorama.ui The default extension for Gtk Builder is .ui. Change it accordingly at the building system. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * main: Wait for filled buffers in read mode When the driver is on read mode, the driver will return immediately from read() callback even when the buffer is not filled. That causes flicker while on read mode. Also, it displays a non-realistic frame rate. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Use cairo instead of using GdkPixmap This is another obsolete part of Gtk 2 API. Replace it in favor of using cairo instead. While here, remove code duplication, as image display logic was on 3 different places. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Replace GTK_WIDGET_VISIBLE() with gtk_widget_get_visible() Replace another Gtk 2 macro that was replaced on Gtk 3. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Replace gtk_object_get_data() with g_object_get_data() Another function that got replaced on Gtk 3. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Remove unused function/function prototype Neither lookup_widget nor io_func are used. As both use some Gtk 2 deprecated functions, get rid of them for good. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Use gtk_container_add() instead of gtk_menu_append() gtk_menu_append() is deprecated and not available anymore with Gtk 3. gtk_container_add() works with both versions, so use it instead. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Don't get window with widget->window directly Such kind of access is deprecated with Gtk 3. So, use, instead the function gtk_widget_get_window(), as it works with both Gtk 2 and Gtk 3. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Use g_foo() variants instead of gtk_foo() Several functions were deprecated, as GLib defines an equivalent one, and got removed on Gtk 3. So, use the GLib version. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Add an option to build with Gtk 3 instead of Gtk 2 By default, Camorama will be built against Gtk 2. However, as it now builds also against Gtk 3, add an option to use Gtk 3 instead. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Update translation files Now that the translation files are auto-generated, the makefile auto-updates them. That makes a way easier to fix, as editors like poedit will see the new strings that were added to camorama along the time. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * pt_BR: Update Brazilian translation Several messages changed along time. Update their translations. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> * Bump version to 0.20 and update ChangeLog There were simply too many changes on Camorama. So, bump its version to 0.20 and reflect latest changes at the ChangeLog. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-07-24Allow selecting the image resolution instead of "small/midium/large"resolution_improvementMauro Carvalho Chehab1-2/+4
The concept of small, midium, large is relative, as it depends on whatever the camera supports. Instead of using it, it is a way better to show a list of the supported resolutions. That works fine for most cameras, with uses a fixed set. On cameras with a scale, the Kernel actually exports the resolution range. On this case, let's present 4 resolutions between the minimum and maximum one. That should be reasonable for most usecases. Nowadays, all drivers should be reporting resolutions via VIDIOC_ENUM_FRAMESIZES. Yet, as one might run camorama with very legacy kernels, provide backward support, using small/midium/large resolutions just like before. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-07-24Prevent activating an already active sizeMauro Carvalho Chehab1-16/+19
Changing resolution is costly, as we need first to wait for pending buffers and stop streaming. So, optimize resolution switch by not trying to activate the already activated resolution.
2018-07-23Optimize the logic with sets control valuesMauro Carvalho Chehab1-5/+5
No need to write all controls when just one changes.
2018-07-23convert camorama to use the V4L2 APIMauro Carvalho Chehab1-167/+48
Currently, camorama is based on a very legacy API (V4L version 1). This got removed from Kernel a long time ago, still at Kernel 2.6.x cycles. It works thanks to libv4l1 emulation, but we may get rid of it soon at v4l-utils. So, let's just move on and implement V4L2 API support directly on Camorama, instead of relying on a compatibility layer.
2014-07-21Use libv4l1 as an emulation layer to ensure compatibilityAlessio Treglia1-11/+20
with the most recent drivers Bug-Debian: http://bugs.debian.org/569089
2014-07-21Imported Upstream version 0.19upstream/0.19Alessio Treglia1-15/+0
2014-07-21Imported Upstream version 0.18upstream/0.18Alessio Treglia1-216/+91
2014-07-21Imported Upstream version 0.17upstream/0.17Alessio Treglia1-0/+961

Privacy Policy