6308aca59f
Fixed bug #33 : The --fullscreen option doesn't work.
2014-10-18 17:07:59 +00:00
80d0f73407
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-10-18 10:05:17 +00:00
2a66de38ff
add --osc-port option
2014-10-17 13:57:13 -04:00
54534c3cf7
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-10-17 11:59:23 -04:00
50a96dc254
Created QIcon for media files using QIconProvider.
2014-10-17 12:29:42 +00:00
ecf0efe956
Port to Qt5 on GNU/Linux
2014-10-16 21:27:06 -04:00
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
eef76173b6
Integrated paint guis while removing remains of oldPaint/double-click system.
2014-10-16 17:52:32 +00:00
ac29ca5c1f
Merged latest changes from develop
2014-10-15 13:42:32 +00:00
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
5640e5b471
Put some long method definitions in the .cpp
2014-10-14 22:36:03 +00:00
1b73d45a89
New feature: menu option toggle sticky vertices
2014-10-14 01:48:00 -04:00
0306a300f0
Reorganized elements in window
2014-10-13 23:05:33 -04:00
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
df3e12db04
Removed old remainder of singleton code
2014-06-26 01:26:59 -04:00
e8f7f44493
Moved MAPMAP_VERSION and MAPMAP_EXTENSION as part of static class MM
2014-06-26 00:56:24 -04:00
bbc0eeb6ae
Added option to import image files using QImage
2014-06-26 00:08:46 -04:00
00a437864d
Integration of toolbars in a single mainToolBar, with runToolBar at the top-right end
2014-06-24 00:39:38 -04:00
7c37c0ede9
Added new toolbars and their appropriate placement
2014-06-23 21:48:05 -04:00
96ae61cea8
Play disables pause and vice-versa
2014-06-23 17:09:29 -04:00
cb0deae5f1
Base implementation of play/pause/rewind (working, still adjustments to do in the GUI)
2014-06-23 16:54:44 -04:00
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
f1e4c3465e
Included MM.h in MainWindow.h
2014-05-02 14:12:45 -04:00
bf05ca0cd9
post-release version bump
2014-04-30 23:52:53 -04:00
5ce262be15
Merge branch 'develop' into release-0.1.0
2014-04-30 22:48:06 -04:00
786fca080a
Added splash screen to the app
2014-04-30 20:06:35 -04:00
73308ab117
Prepare 0.1.0: update version number
2014-04-30 14:14:22 -04:00
df73b0b631
Fixed problem with full screen in Linux
2014-04-29 16:45:03 -04:00
348ffcb37e
Implement OSC callback to set video URI
2014-04-26 19:20:21 +01:00
d276c6a126
Changed extension for mapmap
2014-04-26 12:37:51 +01:00
430b0f223a
Refactor Video -> Media
2014-04-26 12:22:33 +01:00
26e709c5c6
Replaced updateAll() by updateCanvases()
2014-04-26 12:08:00 +01:00
e91496b96a
Merge branch 'spike-video-drone' into gst-osx
2014-04-25 20:52:49 -04:00
6e58f94a48
Simple "hack" with a QTimer to time the video
2014-04-26 01:01:44 +01:00
4d3694fe28
Added an option to toggle the display of shape control points
2014-04-10 18:27:40 -04:00
419834b0ee
Removed MainWindow singleton, replacing it with much more appropriate member pointers in custom widgets
2014-04-10 17:39:37 -04:00
f7bfeb415d
Use major.minor.micro for version number.
2014-03-21 22:34:20 -04:00
ff1d98e1a8
Created a method addPaintId similar to the addMappingId to reuse some code.
2014-03-18 23:26:17 -04:00
7425d65832
Methods removeCurrent*() reset uids to NULL_UID.
2014-03-18 23:02:10 -04:00
540ae8a983
Allow the seamless removal of both paint and mappings.
2014-03-16 19:31:20 -04:00
7c52f13f16
Major cleanup in MainWindow
2014-03-16 15:47:14 -04:00
338a32af60
Cleanup of comments
2014-03-16 01:12:43 -04:00
20c603b995
Implement working mapping removal
2014-03-16 01:12:32 -04:00
3910302f80
Replaced STL vectors and maps by Qt-style
2014-03-16 01:11:38 -04:00
392869f56f
Manage appropriate layout and resizing of output GL canvas
2014-03-15 23:37:54 -04:00
81e519d366
Added an output GL window that reproduces the destination (refresh still not working).
...
Window can be toggled on/off.
2014-03-15 23:01:37 -04:00
07c6293dc7
Load and save of ellipses.
2014-03-02 22:29:10 -05:00
0b027f29f3
Implemented basic support for texture ellipse (works, default center point, no drawing of control points).
2014-03-02 17:02:52 -05:00
1dbb174d86
Merge branch 'develop' into ellipseshape
...
Conflicts:
Shape.h
2014-02-09 01:20:54 -05:00
e36cb1a991
Replace std::vector and std::map by QVector and QMap (not everywhere yet).
2014-02-09 01:02:54 -05:00
Tats