Commit Graph

610 Commits

Author SHA1 Message Date
Alexandre Quessy e232976849 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2014-10-22 19:01:21 +00:00
Alexandre Quessy 3e791997a5 update INSTALL 2014-10-22 18:59:23 +00:00
baydam 0aad565fe3 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-22 17:26:33 +00:00
baydam d9bce3aac3 Fix menubar on fullscreen when plug a second screen and Crosshair 2014-10-22 17:25:55 +00:00
Tats 3acb257cf0 Cleanup in MapperGLCanvas.cpp mousePressedEvent. 2014-10-22 17:18:49 +00:00
Tats 29253351e0 Fixed bug where new media had rate of 1%. 2014-10-22 16:12:13 +00:00
baydam 4107d2c199 Merge branch 'features-options' into develop 2014-10-22 11:17:40 +00:00
baydam c1c8287aed Inverted order in which fullscreen and escape key are called (escape only works in fullscreen). 2014-10-22 11:17:01 +00:00
baydam d3b676f01c Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-22 10:15:16 +00:00
Tats dc976794d9 Added crosshair in fullscreen mode (automatic). 2014-10-21 20:16:23 +00:00
Tats a50d44da23 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-21 20:14:07 +00:00
Vasilis Liaskovitis c4c7d9a8ef MediaImpl:: do not call updateRate() on GST_MESSAGE_ASYNC_DONE (bug #51)
GST_MESSAGE_ASYNC_DONE is received when elements finish changing state. If we
initiate an updateRate here, we keep generating seek events in a loop forever,
pausing and re-starting the pipeline without reason.
2014-10-21 21:47:09 +02:00
Tats c6373b458f Bug fix in media paint gui to allow playback rate in file loading. 2014-10-21 19:33:41 +00:00
Tats 818d985ad1 Uniformize rate to be in % (except in MediaImpl). 2014-10-21 19:33:03 +00:00
Tats 898eb67f9d Fixed bug where movie was constantly polled for seeking and paused/played. 2014-10-21 19:24:56 +00:00
baydam 427d3e52c7 Merge branch 'features-options' into develop 2014-10-21 18:20:56 +00:00
Tats fa400b9788 File save/load of rate. 2014-10-21 17:47:55 +00:00
Tats c8e0c23858 Allow for live changing of video rate with osc. 2014-10-21 17:47:43 +00:00
Tats 58d61bfc25 Made color of controls more visible (white). 2014-10-21 17:47:08 +00:00
baydam 7d1ba1e756 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-21 17:44:33 +00:00
baydam eede8f0f16 Fix issue Escape should make the output window fullscreen #46 and Hide cursor when the mouse is idle in fullscreen mode #39 2014-10-21 17:39:00 +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
Alexandre Quessy b61b96a6df towards state saving locked, etc. 2014-10-21 16:59:34 -04:00
Alexandre Quessy 2cf3589639 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-21 13:12:30 -04:00
Tats 2d8f19043b Cleanup and documentation in MediaImpl. 2014-10-21 16:20:34 +00:00
Tats db97f6dcf5 Implemented basic control of rate (reverse playback not yet operational so disabled option in the gui). 2014-10-21 16:20:20 +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 4375bfaeb5 Merge branch 'no-cursor' into develop 2014-10-21 01:52:56 -04: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
Tats f9d51e6880 More cleanups and documentation in media related stuff. 2014-10-20 19:10:08 +00:00
Alexandre Quessy 363b5795ba Fix delete menu option 2014-10-20 13:54:06 -04:00
baydam aa926ee850 Add Menu listing recents import video 2014-10-20 17:13:14 +00:00
Tats 686c2f9ac0 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-20 17:01:38 +00:00
Tats 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
Alexandre Quessy cf34d604c4 fix 2014-10-20 12:12:41 -04:00
Alexandre Quessy 4ea8f78c94 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
Conflicts:
	MediaImpl.h
2014-10-20 12:12:03 -04:00
Alexandre Quessy ca4eef0e71 Add documentation strings in MediaImpl.h 2014-10-20 12:09:18 -04:00
Alexandre Quessy a9898f4585 Fix a memory leak with the shmsrc poller 2014-10-20 12:08:59 -04:00
Tats c00bf868ad Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-20 13:02:22 +00:00
Tats 69c73d57f0 Added application information. 2014-10-20 12:41:19 +00:00
Tats 2d55e6d9c6 Free memory from call to gst_structure_to_string(). 2014-10-20 11:54:21 +00:00
Tats 2022379c81 Unref more leaking samples in MediaImpl.cpp (queues are kept at a limited size). 2014-10-20 11:53:46 +00:00
baydam f2e69b17a2 Open recents file menu finally working well 2014-10-20 10:53:01 +00:00
Tats 8ae24a0747 Removed commandline options for Qt < 5.0.0 (because it is not supported then). 2014-10-20 10:43:44 +00:00
Tats 7d4e060b78 Removed commandline options for Qt < 5.0.0 (because it is not supported then). 2014-10-20 10:39:20 +00:00
Vasilis Liaskovitis 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
Tats 0735271fa7 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-20 10:13:00 +00:00
Alexandre Quessy 6c95c8f11a Add Dame Diongue to the list of developers 2014-10-18 21:02:42 -04:00