Commit Graph

44 Commits

Author SHA1 Message Date
4050ca5633
Update GPL boilerplate and (C)
Copyright-holder and year information is extracted from git log.

git history begins in 2005. So (C) from 1998..2005 is lost. Also some
(C) assignment of commits where the committer didn't use --author.
2019-08-03 15:53:15 +02:00
f448041ec0 no error logging for CURL HTTP requests; future callers can request it if necessary 2018-06-02 13:24:31 -04:00
93625b108e Use "frame" for video-frames, fixes video-monitor state.
revert/amend/undo 30b087ab for video-related units
2018-01-21 11:27:26 +01:00
2e9fcceb1e Fix video-timeline (request parameter is "frame=") 2017-12-19 19:14:53 +01:00
c6e53e7785 Use "Frames" for video-frames (NO-OP) 2017-12-19 19:14:33 +01:00
30b087ab3d globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible
2017-09-18 12:39:17 -04:00
e9a2eea867 remove old a3_curl API and switch some curl calls
Keep freesound-moocher as is until freesound-apiv2 branch is merged
or rebased.
2016-07-18 16:46:59 +02:00
cf52d6e4b4 enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h 2016-07-14 14:45:23 -04:00
65716d968e don't export video-frame request function 2015-10-04 02:04:59 +02:00
38bae2996a Remove ardour_ui.h header inclusion 2015-09-16 16:55:17 -04:00
a3c378cf62 move utility functions into a dedicated namespace 2014-06-25 21:47:54 +02:00
6a5d805b38 more canvas refactoring.
Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it
could theoretically be used by any derived type.
2014-06-22 11:41:05 -04:00
0796ccfb65 use newly factored canvas in gtk2_ardour 2014-06-21 11:44:22 -04:00
67ddda0158 vtl: fix leftover typo in request URL (noop) 2014-04-21 13:45:53 +02:00
19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
d76efc97a3 Use Glib::usleep for portability 2013-09-06 14:31:31 +10:00
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00
b5845ea458 dedicated namespace for video-utils
conflicting symbol prophylaxis
2013-08-08 15:26:19 -04:00
43ae996b3a dedicated namespace for video-utils
conflicting symbol prophylaxis
2013-08-03 16:54:57 +02:00
d975d84437 Use GLib::usleep for portability 2013-07-22 13:44:32 +10:00
ffbe9a949e fix unused argument warning 2013-06-21 17:14:53 -04:00
11619a37bf Merge branch 'master' into cairocanvas
Conflicts:
	gtk2_ardour/editor_canvas.cc
	gtk2_ardour/imageframe_time_axis.cc
	gtk2_ardour/imageframe_time_axis.h
	gtk2_ardour/imageframe_time_axis_group.cc
	gtk2_ardour/imageframe_time_axis_group.h
	gtk2_ardour/imageframe_time_axis_view.cc
	gtk2_ardour/imageframe_time_axis_view.h
	gtk2_ardour/imageframe_view.cc
	gtk2_ardour/imageframe_view.h
	gtk2_ardour/marker_time_axis.cc
	gtk2_ardour/marker_time_axis.h
	gtk2_ardour/marker_time_axis_view.cc
	gtk2_ardour/marker_time_axis_view.h
	gtk2_ardour/marker_view.cc
	gtk2_ardour/marker_view.h
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/visual_time_axis.cc
	gtk2_ardour/visual_time_axis.h
	libs/canvas/canvas/circle.h
2013-06-14 21:09:24 +02:00
006e3575be NOOP clean up code
move curl-http-get wrapper-function which is used by various
videotimeline related code to util.c
2013-06-14 13:58:56 +02:00
e1b0f1bd0b merge with master 2013-05-04 22:41:10 -04:00
40944574c6 the big rework of window management. probably not complete at thsi point, but this is mostly functional 2013-05-04 22:02:05 -04:00
8f2a2877b5 ArdourCanvas::Image allow to set custom data instead of class pre-allocated memory. 2013-04-17 20:26:09 +02:00
c6d5b2ce6d fix typo 2013-04-16 21:39:24 -04:00
3beadec936 fix screwup with 5285d2 and 930fce 2013-04-17 03:36:35 +02:00
5285d21e35 amend to 930fce 2013-04-17 03:34:54 +02:00
930fce8696 vtl: s/[audio]frame/sample/ 2013-04-17 03:21:39 +02:00
131b8eac57 vtl: remove cruft 2013-04-17 03:10:51 +02:00
3d169d00bb vtl: remove superfluous group 2013-04-16 23:28:53 +02:00
b713af2083 vtl: use ArdourImage
* update videotimeline -> new zoom, position API
* update image-frame use Cairo based ArdourImage instead of GdkPixbuf
2013-04-16 23:28:08 +02:00
5665227669 fix some unused argument warnings 2013-04-16 14:03:51 -04:00
4258a34912 change all frame_to_pixel and pixel_to_frame to sample_to_pixel and pixel_to_sample 2013-04-12 11:15:45 -04:00
ecfd2a7455 remove all unit-based methods from (Public)Editor; rationalize Editor::event_frame() to clearly identify whether the passed-in GdkEvent has window units or canvas units (the latter will be true for all events that are handled by the canvas and then passed to Editor 2013-04-12 11:09:49 -04:00
6ae4f10437 Merge branch 'master' into cairocanvas
Conflicts:
	gtk2_ardour/editor.h
	gtk2_ardour/editor_canvas.cc
	gtk2_ardour/wscript
2013-04-11 22:24:05 +02:00
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
ca1d58c254 vtl: remove inadvertently committed CURLERRORDEBUG 2013-04-10 23:40:23 +02:00
6830d83236 vtl: make videotimeline work with new cairo canvas
timeline thumbnail display, moving (drag/drop) and zoom works.

There still some crashes e.g. resizing the height of the timeline
and with off-screen image buffering when zooming in.
Likely due to concurrency issues:
VideoImageFrame::exposeimg() and direct access of the pixbuf:
"Assertion `!_bounding_box_dirty' failed." in canvas/item.cc:191

more work is needed..
2013-04-06 04:10:27 +02:00
41faeb76e1 fix typo in prev commit 2013-03-26 14:48:15 +01:00
0781b871d4 vtl: increase retry timeout on 503, print http status on error. 2013-03-26 14:11:52 +01:00
e1f3dcee2a vtl: re-request frame on 503/try-again 2013-03-19 00:48:37 +01:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00