6c95c8f11a
Add Dame Diongue to the list of developers
2014-10-18 21:02:42 -04:00
c309219cea
Fixed bug #33 : The --fullscreen option doesn't work.
2014-10-18 14:28:22 +00:00
1d152d487f
Integrated latest changes from Dame wrt item selections (paint and mapping lists).
2014-10-18 13:40:42 +00:00
d667313ce8
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
...
Conflicts:
MainWindow.cpp
MediaImpl.cpp
2014-10-18 13:22:36 +00:00
c9b0888231
Reenabled seeking when clip is over (loop) without having to reload the movie.
2014-10-18 13:11:21 +00:00
d275cf065d
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-10-18 11:28:16 +00:00
103424ece7
Fix bugs when shape selected, select corresponding mapping
2014-10-18 11:18:20 +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
a72f183d24
Try to make --fullscreen option work
2014-10-17 11:58:55 -04:00
3b4ca8653c
Fixed bug #28 otherwise
2014-10-17 15:58:08 +00:00
332cea7030
Fix issues New paint item does not get selected in some circumstances #28
2014-10-17 15:45:39 +00:00
50a96dc254
Created QIcon for media files using QIconProvider.
2014-10-17 12:29:42 +00:00
e3bfe310b3
Added Mapmap logo title to About.
2014-10-17 12:29:15 +00:00
ecf0efe956
Port to Qt5 on GNU/Linux
2014-10-16 21:27:06 -04:00
e31e412378
Do not store OSC port in settings (for now)
2014-10-16 20:30:45 -04:00
d3c54a183f
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-10-16 21:47:31 +00: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
fc89b4fb11
Added PaintGui for textures.
2014-10-16 17:51:41 +00:00
948a68c8ee
Removed commented out deleteAction (minor change).
2014-10-16 17:50:55 +00:00
4e8a2c19f1
Slightly better timer interval management (with global const variable).
2014-10-16 17:28:17 +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
f6644d2b15
Remove unused Facade.{h,cpp} and Controller
2014-10-14 18:11:50 -04:00
31896eb38b
Write/read outputWindowFullscreen setting
2014-10-14 10:59:19 -04:00
695c0fe751
Do not display output window at startup
2014-10-14 10:54:01 -04:00
1b73d45a89
New feature: menu option toggle sticky vertices
2014-10-14 01:48:00 -04:00
8f03e98010
Main splitter gets all the extra width when window is stretched
2014-10-13 23:53:38 -04:00
8f1c1fb35f
Fix main splitter proportion
2014-10-13 23:51:54 -04:00
3a8824ec52
Small fixes
2014-10-13 23:51:40 -04:00
b941819051
When paint is changed, unselect any mappings
2014-10-13 23:41:29 -04:00
fe90060ba3
When mapping is changed, corresponding paint is changed
2014-10-13 23:41:14 -04:00
aac83a576a
Switch to mapping tab when mapping is added.
2014-10-13 23:29:40 -04:00
b6292e5fa4
Switch to paint tab when new paint added
2014-10-13 23:23:02 -04:00
9e2dcc21e8
Update read and write settings for new elements
2014-10-13 23:22:24 -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
6adad6ac77
Video plays by default (at startup).
2014-09-16 20:54:14 -04:00
91425ab014
improve release process on OS X
2014-07-07 15:59:39 -04:00
42b0a6708f
Merge branch 'develop' into osc-fix-july-2014
2014-07-07 15:30:37 -04:00
03635c4904
Import video and image dialogs are now restrictive on definite file extensions (with option to select any)
2014-06-26 00:56:53 -04:00
e8f7f44493
Moved MAPMAP_VERSION and MAPMAP_EXTENSION as part of static class MM
2014-06-26 00:56:24 -04:00
2ede19425b
Fixed bug in ellipse creation: two last points of input ellipse were wrong
2014-06-26 00:27:15 -04:00
45535c80a1
Cleanup debug message
2014-06-26 00:13:42 -04:00
bbc0eeb6ae
Added option to import image files using QImage
2014-06-26 00:08:46 -04:00
bcdfed3aca
Start timer after creating everything
2014-06-25 23:00:24 -04:00
ab2df9a00f
Make icons invisible in menus (not working on Ubuntu Unity but maybe somewhere else)
2014-06-25 21:28:42 -04:00
Alexandre Quessy