aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-08-21Update *.po files to match the current interfacegtkbuilderMauro Carvalho Chehab48-3846/+5081
Due to the changes at camorama.schema, several messages changed to a different position. Also, newer messages require translation. Update the po files accordingly. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-21Convert to GtkBuilderMauro Carvalho Chehab8-1032/+1032
Instead of using libglade, use GtkBuilder. This removes one dependency from Camorama and makes easier to convert to Gtk+3. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-21Use GtkStatusbar instead of GnomeAppBarMauro Carvalho Chehab2-4/+3
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>
2018-08-21camorama.glade: get rid of bonobo and GnomeAppMauro Carvalho Chehab1-510/+497
Do some cleanup at camorama.glade in order to make it easier to convert later to Gtk3 by removing bonobo-specific and GnomeApp widget dependencies. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-21Replace custom widget by GtkDrawingAreaMauro Carvalho Chehab7-217/+19
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>
2018-08-21camorama.glade: use glade-3 to generate itMauro Carvalho Chehab1-2600/+1853
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>
2018-08-21Add labels for GNOMEUIINFO_MENU_* itemsMauro Carvalho Chehab1-0/+9
glade-3 doesn't recognize GNOMEUIINFO_MENU_* stock_item anymore. So, we need labels. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-21get rid of deprecated GTK_WIDGET_STATE()Mauro Carvalho Chehab1-1/+1
Use gtk_widget_get_state() instead. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-21stop using deprecated gdk_pixbuf_new_from_inline()Mauro Carvalho Chehab11-538/+17
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>
2018-08-21fileio: use g_thread_new() instead of g_thread_create()Mauro Carvalho Chehab1-1/+1
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>
2018-08-21filter: get rid of a warningMauro Carvalho Chehab1-0/+1
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>
2018-08-21Include only gtk.h headerMauro Carvalho Chehab4-5/+4
Instead of including header files just for a few widgets used, include the main one. That's a rule on GTK+3. That also allows building it with: make CFLAGS+="-DGTK_DISABLE_SINGLE_INCLUDES" Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-21Merge branch 'devel/fixes' into devel/gtkbuilderMauro Carvalho Chehab7-29/+50
* devel/fixes: v4l: make print_cam() useful v4l: Better name V4L bits per pixel field Fix depth on filters and fileio
2018-08-21pt_BR: Update Brazilian translationpo_updateMauro Carvalho Chehab1-26/+33
Several messages changed along time. Update their translations. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-21Update translation filesMauro Carvalho Chehab48-18366/+19679
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>
2018-08-21Auto-translate camorama.appdata.xmlMauro Carvalho Chehab5-22/+59
Add locale translations for camorama.appdata.xml too. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-21Auto-translate camera.desktopMauro Carvalho Chehab7-44/+76
Add the needed logic to auto-translate camera.desktop. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-21callbacks: allow translating the fps streaming messageMauro Carvalho Chehab1-1/+1
Use gettext to allow translating this message: "%.2f fps - current %.2f fps - average" Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-18POFILES.in: add missing sourcesMauro Carvalho Chehab1-2/+4
Several sources are missing at the POFILES.in. Update. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-18Update auto-generated build filesMauro Carvalho Chehab56-2521/+11829
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>
2018-08-18Convert it to use the new gettext logicMauro Carvalho Chehab6-11/+91
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>
2018-08-17Update build systemMauro Carvalho Chehab17-10480/+7909
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-17autogen.sh: use a more modern approachMauro Carvalho Chehab1-18/+4
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>
2018-08-17Rename configure.in to configure.acMauro Carvalho Chehab2-3/+3
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>
2018-08-17Add a camorama.appdata.xmlMauro Carvalho Chehab1-0/+19
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>
2018-08-17v4l: fix a typoMauro Carvalho Chehab1-1/+1
enqueu -> enqueue Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-17Bug reports should be done at the github treeMauro Carvalho Chehab1-1/+1
Not sure why it is listing gnome for bug report. I suspect it was due to some cut-and-paste thing. Update it to point to upstream's camorama repository at github. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2018-08-17Get rid of *~ backup files and autom4mate.cache/Mauro Carvalho Chehab11-2005/+6
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>
2018-08-17v4l: make print_cam() usefulMauro Carvalho Chehab3-6/+27
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>
2018-08-17v4l: Better name V4L bits per pixel fieldMauro Carvalho Chehab7-24/+24
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>
2018-08-17Fix depth on filters and fileioMauro Carvalho Chehab2-9/+9
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>
2018-08-01Merge pull request #12 from mchehab/resolution_improvementAlessio Treglia6-45/+174
Resolution improvement
2018-07-24Allow selecting the image resolution instead of "small/midium/large"resolution_improvementMauro Carvalho Chehab5-20/+129
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-24Dynamically create midium/large resolutionsMauro Carvalho Chehab2-28/+28
2018-07-24Prevent activating an already active sizeMauro Carvalho Chehab3-16/+36
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-23Merge pull request #11 from mchehab/v4l2_convertAlessio Treglia114-39732/+648
V4l2 convert
2018-07-23Rename control widgets, in order to make easier to reference them.v4l2_convertMauro Carvalho Chehab2-25/+25
Right now, widgets associated with controls just have a random name. Instead, use a name related to their usage, to make easier to reference them inside src/camera-window.c.
2018-07-23Hide V4L2 controls if not present at the cameraMauro Carvalho Chehab3-26/+66
Not all controls are available on all cameras. Be sure to show only the ones that apply to the camera used. While here, fix the callback logic for whitebalance
2018-07-23Ignore pad bytes on camera streamsMauro Carvalho Chehab2-4/+10
On a perfect world, the memory mapped buffer would contain the exact frame image. However, due to hardware constraints (typically at their DMA engines), sometimes there are pad bytes after the end of each line. So, change the memcpy algorithm to take it into account.
2018-07-23Optimize the logic with sets control valuesMauro Carvalho Chehab4-25/+5
No need to write all controls when just one changes.
2018-07-23convert camorama to use the V4L2 APIMauro Carvalho Chehab9-429/+551
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.
2018-07-23Add two missing includes to main.cMauro Carvalho Chehab1-0/+2
Cleanup a few warnings by adding the proper header files.
2018-07-23Explicitly include libmMauro Carvalho Chehab2-2/+2
There are some routines inside camorama that require the library. Sometimes, it is not probed well, so explicitly add it.
2018-07-23Remove auto-generated filesMauro Carvalho Chehab104-39257/+23
It is very hard to see what's happening when the file-generated stuff is part of the git tree. Remove the ones that are generated by ./configure and make.
2018-02-19Merge pull request #10 from RepRapLtd/masterAlessio Treglia126-24/+40943
Motion detector filter
2017-09-26Final (?) version of the Reichardt-Hassenstein filter.Adrian Bowyer38-1598/+628
2016-09-12README updated.Adrian Bowyer2-0/+124
2016-09-12Reichardt filter added properly to menus etc.Adrian Bowyer35-601/+4978
2016-09-11Working version. Mirror filter replaced by Reichardt.Adrian Bowyer7-90/+173
Need to adjust the filter time constants.
2016-09-10Adding a visual flow/Reichardt filter to camorama. WIP.Adrian Bowyer106-37/+37342

Privacy Policy