01ad2f9f41
Merge branch 'develop' of github.com:mapmapteam/mapmap into features-options
2014-10-21 13:15:33 +00:00
2cf3589639
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-10-21 13:12:30 -04:00
ffb27c7af2
File chooser maynow remember the last directory
2014-10-21 12:45:44 +00:00
4375bfaeb5
Merge branch 'no-cursor' into develop
2014-10-21 01:52:56 -04:00
afc84bb692
Fix logic in setCursorVisible + make it visible if controls are
2014-10-21 01:52:03 -04:00
af84795c78
Try to hide cursor in output window, when desired
2014-10-20 17:13:37 -04:00
f9d51e6880
More cleanups and documentation in media related stuff.
2014-10-20 19:10:08 +00:00
363b5795ba
Fix delete menu option
2014-10-20 13:54:06 -04:00
aa926ee850
Add Menu listing recents import video
2014-10-20 17:13:14 +00:00
686c2f9ac0
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-10-20 17:01:38 +00:00
7fe2a1f1a7
Bugfix #30 : Reimplemented MediaImpl removing the defective queue system and implementing a thread-safe system. Removed the memory leaks previously shown by valgrind.
2014-10-20 17:00:22 +00:00
cf34d604c4
fix
2014-10-20 12:12:41 -04:00
4ea8f78c94
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
...
Conflicts:
MediaImpl.h
2014-10-20 12:12:03 -04:00
ca4eef0e71
Add documentation strings in MediaImpl.h
2014-10-20 12:09:18 -04:00
a9898f4585
Fix a memory leak with the shmsrc poller
2014-10-20 12:08:59 -04:00
c00bf868ad
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-10-20 13:02:22 +00:00
69c73d57f0
Added application information.
2014-10-20 12:41:19 +00:00
2d55e6d9c6
Free memory from call to gst_structure_to_string().
2014-10-20 11:54:21 +00:00
2022379c81
Unref more leaking samples in MediaImpl.cpp (queues are kept at a limited size).
2014-10-20 11:53:46 +00:00
f2e69b17a2
Open recents file menu finally working well
2014-10-20 10:53:01 +00:00
8ae24a0747
Removed commandline options for Qt < 5.0.0 (because it is not supported then).
2014-10-20 10:43:44 +00:00
7d4e060b78
Removed commandline options for Qt < 5.0.0 (because it is not supported then).
2014-10-20 10:39:20 +00:00
c85b4e073c
MediaImpl: move buffer processing in gstNewSampleCallback (bug #30 )
...
Buffer releasing should happen independently of videoPull() getting called for
texture updates. We move all processing and buffer unreferencing in
gstNewSampleCallback. This way we don't run out of memory in case of video
pipeline playing without texture/mappings.
2014-10-20 10:14:38 +00:00
0735271fa7
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-10-20 10:13:00 +00:00
6c95c8f11a
Add Dame Diongue to the list of developers
2014-10-18 21:02:42 -04:00
20d930fa99
Starting to add Recent File action, but not working yet
2014-10-18 18:45:51 +00:00
6308aca59f
Fixed bug #33 : The --fullscreen option doesn't work.
2014-10-18 17:07:59 +00:00
835165c89a
Fix some issues with shmsrc pipeline and video dimensions (bug #29 )
...
Shmsrc seems to work with a gstreamer 1.4 build, but not with distro gstreamer
(segfault due to missing fix https://bugzilla.gnome.org/show_bug.cgi?id=731093 )
Reader / writer of live source need to be using same gstreamer build, otherwise
some pipeline problems appear in deserializing and caps detection.
Playback of the first shape mapped with the live source doesn't seem to work (?),
so this bug stiil needs investigation.
2014-10-18 19:03:06 +02:00
8e9f7dd7e5
use startFullScreen to fix compilation failure (introduced for bug #33 )
2014-10-18 17:35:06 +02: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
851aa5234b
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-10-18 12:18:44 -04:00
436dc9d5a0
Refactor the pipeline + fix merge shmsrc feature
2014-10-18 12:17:38 -04: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
6f015b1cb8
Moved gst_init() in main application and added gst_deinit().
2014-10-18 10:05:53 +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
c53cb753ef
add scripts/replate-path-in-project.sh
2014-10-17 13:41:10 -04:00
63e01d5285
add --file option
2014-10-17 13:33:04 -04:00
a0cea41fc5
Add --reset-settings option
2014-10-17 13:12:07 -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
40c7dc039b
Added logos as QRC (resources).
2014-10-17 12:30:27 +00:00
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
baydam