108 Commits

Author SHA1 Message Date
baydam 539d189f9d Fixed issue Adjust position of vertices using arrow keys not working on output display #77 2014-11-05 17:17:37 +00:00
Vasilis Liaskovitis f6711ed7a8 Control mapping visibility from OSC (bug #43)
Controlled with /mapmap/mapping/visible mappingId visibility (type ii)
e.g.
oscsend localhost 7000 /mapmap/mapping/visible ii "3" "0"
to make mapping with id 3 invisible
oscsend localhost 7000 /mapmap/mapping/visible ii "0" "1"
to make mapping with id 3 visible

QListWidgetItem checkstate is also changed accordingly
2014-11-01 02:50:30 +02:00
Alexandre Quessy 9143e309f7 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-27 19:53:27 -04:00
Alexandre Quessy aab266b843 Can change OSC port via preferences dialog 2014-10-27 15:25:41 -04:00
baydam 248cc8494c All menubar shortcut work when output window is displayed 2014-10-27 19:15:39 +00:00
Alexandre Quessy be0053764d add PreferencesDialog - not yet effective 2014-10-27 14:05:36 -04:00
Alexandre Quessy 3bcbbc7697 Display test signal 2014-10-27 06:04:12 -04:00
Tats 29253351e0 Fixed bug where new media had rate of 1%. 2014-10-22 16:12:13 +00:00
baydam d3b676f01c Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-22 10:15:16 +00:00
baydam 427d3e52c7 Merge branch 'features-options' into develop 2014-10-21 18:20:56 +00:00
Tats c8e0c23858 Allow for live changing of video rate with osc. 2014-10-21 17:47:43 +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
baydam 01ad2f9f41 Merge branch 'develop' of github.com:mapmapteam/mapmap into features-options 2014-10-21 13:15:33 +00:00
baydam ffb27c7af2 File chooser maynow remember the last directory 2014-10-21 12:45:44 +00:00
Alexandre Quessy afc84bb692 Fix logic in setCursorVisible + make it visible if controls are 2014-10-21 01:52:03 -04:00
Alexandre Quessy af84795c78 Try to hide cursor in output window, when desired 2014-10-20 17:13:37 -04:00
baydam aa926ee850 Add Menu listing recents import video 2014-10-20 17:13:14 +00:00
baydam f2e69b17a2 Open recents file menu finally working well 2014-10-20 10:53:01 +00:00
baydam 20d930fa99 Starting to add Recent File action, but not working yet 2014-10-18 18:45:51 +00:00
Tats c309219cea Fixed bug #33: The --fullscreen option doesn't work. 2014-10-18 14:28:22 +00:00
Tats 80d0f73407 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-18 10:05:17 +00:00
Alexandre Quessy 2a66de38ff add --osc-port option 2014-10-17 13:57:13 -04:00
Alexandre Quessy 54534c3cf7 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-17 11:59:23 -04:00
Tats 50a96dc254 Created QIcon for media files using QIconProvider. 2014-10-17 12:29:42 +00:00
Alexandre Quessy ecf0efe956 Port to Qt5 on GNU/Linux 2014-10-16 21:27:06 -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
Tats ac29ca5c1f Merged latest changes from develop 2014-10-15 13:42:32 +00:00
Tats 55e909dc69 Introduced a property panel for paints and managed the case of color (disabling double-click feature in the process) 2014-10-14 22:36:54 +00:00
Tats 5640e5b471 Put some long method definitions in the .cpp 2014-10-14 22:36:03 +00:00
Alexandre Quessy 1b73d45a89 New feature: menu option toggle sticky vertices 2014-10-14 01:48:00 -04:00
Tats 0306a300f0 Reorganized elements in window 2014-10-13 23:05:33 -04: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 df3e12db04 Removed old remainder of singleton code 2014-06-26 01:26:59 -04:00
Tats e8f7f44493 Moved MAPMAP_VERSION and MAPMAP_EXTENSION as part of static class MM 2014-06-26 00:56:24 -04:00
Tats bbc0eeb6ae Added option to import image files using QImage 2014-06-26 00:08:46 -04:00
Tats 00a437864d Integration of toolbars in a single mainToolBar, with runToolBar at the top-right end 2014-06-24 00:39:38 -04:00
Tats 7c37c0ede9 Added new toolbars and their appropriate placement 2014-06-23 21:48:05 -04:00
Tats 96ae61cea8 Play disables pause and vice-versa 2014-06-23 17:09:29 -04:00
Tats cb0deae5f1 Base implementation of play/pause/rewind (working, still adjustments to do in the GUI) 2014-06-23 16:54:44 -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
Tats f1e4c3465e Included MM.h in MainWindow.h 2014-05-02 14:12:45 -04:00
Alexandre Quessy bf05ca0cd9 post-release version bump 2014-04-30 23:52:53 -04:00
Alexandre Quessy 5ce262be15 Merge branch 'develop' into release-0.1.0 2014-04-30 22:48:06 -04:00
Tats 786fca080a Added splash screen to the app 2014-04-30 20:06:35 -04:00
Alexandre Quessy 73308ab117 Prepare 0.1.0: update version number 2014-04-30 14:14:22 -04:00
Tats df73b0b631 Fixed problem with full screen in Linux 2014-04-29 16:45:03 -04:00
Alexandre Quessy 348ffcb37e Implement OSC callback to set video URI 2014-04-26 19:20:21 +01:00
Tats d276c6a126 Changed extension for mapmap 2014-04-26 12:37:51 +01:00
Tats 430b0f223a Refactor Video -> Media 2014-04-26 12:22:33 +01:00