Commit Graph

28 Commits

Author SHA1 Message Date
Tats 557227ac89 Explicitely wrote namespace in file instead of using MM_*_NAMESPACE (related to #278). 2016-11-29 00:21:25 -05:00
Tats 3e04d19797 Fixed: Introduction of namespace had broken compatibility with file format. 2016-03-16 20:15:49 -04:00
baydam b375367811 Integrate all code inside a namespace 2016-03-16 18:05:47 +00:00
Tats 8de0b3c7d6 Cleanup. 2016-02-12 12:03:16 -05:00
Tats 1caff94eba Replaced ProjectAttributes with ProjectLabels. 2016-02-12 11:19:47 -05:00
Tats cf11335c1d Implemented parsing of mappings and shapes. 2016-01-28 12:28:19 -05:00
Tats b9f2c80a19 Read/write of Color and Image paint working. 2016-01-21 20:50:44 -05:00
Tats fa400b9788 File save/load of rate. 2014-10-21 17:47:55 +00:00
Tats 82aad45a97 Fixed support for read/write of mapping visibility (solo and locked are still incomplete). 2014-10-21 17:18:25 +00:00
Alexandre Quessy b61b96a6df towards state saving locked, etc. 2014-10-21 16:59:34 -04:00
Tats bafff221bd Merge branch 'feature/shmsrcbin-rebase-oct2014' of https://github.com/vliaskov/libremapping into feature-merge-vliaskov-shmsrcbin
Conflicts:
	MainWindow.cpp
	MainWindow.h
	MediaImpl.cpp
	ProjectReader.cpp
2014-10-16 21:46:33 +00:00
Tats eef76173b6 Integrated paint guis while removing remains of oldPaint/double-click system. 2014-10-16 17:52:32 +00:00
Vasilis Liaskovitis f3e94f743c Support shmsrc (live source)
If the imported file is a socket path, we mark the media as "live". We
continuously poll for the socket path (in case e.g. it disappears / reappears).
As soon as the source socket patch exists, we connect a shmsrc ! gdpdepay
pipeline  (instead of a normal uridecodebin element for file-based media) and we
set the pipeline state to PLAYING (playAction button is not needed at the moment
for live sources, but we can change behaviour to only start the pipeline if
play is selected, like with normal file-based media)

In case of a GST_MESSAGE_ERROR, the polling function keeps looking for the
socket path until it exists again. The existing shmsrc pipeline is re-used
once the live source is transmitting again.

Tested with live source gst-launch-1.0:

gst-launch-1.0 uridecodebin uri=file:////opt/Videos/test.avi !  queue !
videoconvert ! video/x-raw, format="RGBA" ! gdppay ! shmsink
socket-path=/tmp/sock  shm-size=100000000

The live source was interrupted and restarted again, and the shmsrc in mapmap is
able to pick up the reappearing media stream.

Signed-off-by: Vasilis Liaskovitis <vliaskov@gmail.com>
2014-10-13 16:07:50 +02:00
Tats 054a6d2b37 Save and load image paints 2014-06-26 00:13:12 -04:00
Tats bbc0eeb6ae Added option to import image files using QImage 2014-06-26 00:08:46 -04:00
Vasilis Liaskovitis 1aace8a578 Change the uri of existing media or color paint with double-click
When double-clicking a paint QListWidgetItem, the uri of that paint can be
altered.

A new signal is sent to ColorMapper and TextureMapper objects so that they can
update heir color and texture paints respectively. Mappings of the old paint are
transferred to the new paint.

TODO: the active mapping may be lost in some cases, needs some more testing.
2014-05-22 11:30:25 +02:00
Alexandre Quessy 3dcd51ef8d XML file version is now 0.1 2014-04-30 22:28:41 -04:00
Tats 430b0f223a Refactor Video -> Media 2014-04-26 12:22:33 +01:00
Alexandre Quessy 0cf4a5086c Rename project to MapMap 2014-03-04 11:35:12 -05:00
Tats 07c6293dc7 Load and save of ellipses. 2014-03-02 22:29:10 -05:00
Tats e36cb1a991 Replace std::vector and std::map by QVector and QMap (not everywhere yet). 2014-02-09 01:02:54 -05:00
Tats e91fe5d862 Statesaving of color paints / mappings 2014-01-23 22:01:21 -05:00
Tats 9219cee81c Add save/load of meshes 2014-01-11 23:02:52 -05:00
Tats 2fb214060b Reading and writing of triangle mappings 2014-01-11 21:56:18 -05:00
Alexandre Quessy 7f99061cf0 minor edits 2014-01-05 15:48:53 -05:00
Alexandre Quessy 31de8211cd Add optional OSC support
Add OSC receiver

add BUGS

fix README

OSC: use QVariantList to send messages to the main window

show text under icons in toolbar

remove deprecated class

detect liblo and make it optional
2013-12-10 04:55:22 -05:00
Alexandre Quessy 55b6cc2385 XML parsing: progress reading elements 2013-12-09 23:30:26 -05:00
Alexandre Quessy 8c2b7fddd6 Load: 50% done. Fix shortcuts. 2013-12-09 17:33:35 -05:00