eb42367bb4
Renamed logo file (big).
2014-10-17 12:30:17 +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
d3c54a183f
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-10-16 21:47:31 +00:00
7e89ee4ed7
OSC: fix check for a valid OSC server
2014-10-16 20:31:14 -04:00
e31e412378
Do not store OSC port in settings (for now)
2014-10-16 20:30:45 -04:00
880cf70e93
Check if file exists before creating the pipeline
2014-10-16 20:30:20 -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
a7e1e61aca
Merge branch 'feature-refactor-gui-organization' into develop
...
Conflicts:
MappingManager.h
2014-10-16 20:58:40 +00:00
abb62dc1f2
Integrated file choosing pop-up for images and media in property browser.
2014-10-16 20:56:02 +00:00
13ff156159
Made function _getBits() protected.
2014-10-16 18:28:20 +00:00
a5255c2824
Cleanup and documentation in MappingManager.h.
2014-10-16 18:25:06 +00:00
96b55099de
In MappingManager::reorderMapping added some extra check to make sure we're sending an appropriate QVector<uid> (no repetition in the uids).
2014-10-16 18:24:55 +00:00
2f75e4d2ca
Adjustment to MappingManager::getVisibleLayers() so that solo-ed layers that are not-visible don't show.
2014-10-16 18:22:42 +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
bc456961a1
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-10-14 22:15:26 -04: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
f63885f4f0
Add missing MM.h to mapmap.pro
2014-10-14 10:52:10 -04:00
bb1ac54c32
Fix: Press Esc: Do not close output window
2014-10-14 10:42:01 -04:00
cbee34aabd
Feature: Select a shape with a click
2014-10-14 07:40:17 -04:00
5e6e4909e1
Fix: radius for dragging vertices. Drag shape with left click.
2014-10-14 06:20:22 -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
39ee4903c7
fix fullscreen on gnome
2014-10-13 23:21:44 -04:00
0306a300f0
Reorganized elements in window
2014-10-13 23:05:33 -04:00
e9dc1a7686
Add .sock extension for live sources
2014-10-13 23:34:03 +02: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
2e7eb8d5b0
Major cleanup in MediaImpl
2014-10-12 00:12:04 -05:00
4246c5a3b4
Bugfix: video size was not properly set for many videos.
2014-09-16 20:54:40 -04:00
6adad6ac77
Video plays by default (at startup).
2014-09-16 20:54:14 -04:00
b8a3135169
post-release version bump
2014-07-07 16:35:58 -04:00
fe60dc678f
update build.sh
2014-07-07 16:31:53 -04:00
6be2aa0057
also copy NEWS to dmg
2014-07-07 16:29:12 -04:00
623498daf6
update NEWS
2014-07-07 16:27:03 -04:00
91425ab014
improve release process on OS X
2014-07-07 15:59:39 -04:00
Tats