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
b02dc5e622
Bug fix: in Qt5 the layoutChanged() did not work anymore for the layer reordering
2014-06-23 16:20:52 -04:00
64889af9a9
Fixed OSX-related runtime errors that were making the application crash
2014-06-23 14:53:29 -04:00
a596f319fe
Added some documentation comments
2014-06-23 10:29:45 -04:00
fae18b4606
Save display output window state in settings to preserve preference / last saved state of the user
2014-06-11 14:42:34 -04:00
aa39752b98
Some cleanup / reorganization of code
2014-06-10 22:27:12 -04:00
66dc735861
Added _preDraw() and _postDraw() methods to avoid repetition of code in TextureMapper
2014-06-10 22:26:41 -04:00
011790372b
Comments added
2014-06-10 22:24:54 -04:00
20c0ca4cd1
Remove unused glPopMatrix() (had no corresponding glPushMatrix()).
2014-06-10 22:24:05 -04:00
fe91045741
Removed unused file Defs.h
2014-06-10 16:55:16 -04:00
9dedaea443
Small potential problem fix in OscReceiver.cpp (potential mem issue detected using valgrind).
2014-06-08 22:55:54 -04:00
aa2b0847a7
Correct listing of gstreamer1.0 packages to install under Ubuntu
2014-06-08 22:54:58 -04:00
acba98a9cf
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-05-28 15:38:23 -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
33f0625005
update build.sh to use macdeployqt
2014-05-21 16:06:57 -04:00
0d51f784e4
update packaging for OS X
2014-05-21 14:34:06 -04:00
1da6d0479a
Add arabic translation file
2014-05-15 19:16:31 -04:00
78d8f88e52
MediaImpl: Do buffer pull in "new-sample" gstreamer callback
...
Doing the buffer pull in the gstreamer "new-buffer" callback decreases the work
needed to be done by the videoPull() thread. This seems to give lower average
timestamps between successive draw/updatecanvas() calls, so perhaps better
framerates can be achieved.
In order to decouple videoPull from pulling the buffer, an async queue is
introduced between the gstreamer "new-sample" callback and the qt videoPull
function. On the release path, gst_sample_unref is decoupled from the qt side by
putting the already used frame in an output async queue. The bffers in the queue
are unreferenced in the gst "new-sample" callback.
2014-05-10 16:26:37 +02:00
e3da235a82
add AsyncQueue (needed for VIdeoImpl)
...
taken from gst-plugins-gl/tests/examples/qt/qglwtextureshare
2014-05-10 16:12:03 +02:00
4c80d2c543
MediaImpl: ALways do memcpy, no conversion needed
...
Because of the RGBA caps, bpp will always be 32
2014-05-10 16:11:59 +02:00
dc25c2a874
Merge branch 'gst-1.0' into develop
2014-05-09 20:24:35 -04:00
4776dd2717
fix
2014-05-09 20:20:43 -04:00
7177796844
MediaImpl: always set bitsChanged to true to avoid texture "flickering"
2014-05-09 14:57:30 -04:00
f914b84be6
MediaImpl: remove gst_sample_ref to avoid leak
...
The gst_sample pulled from the appsink is already reference counted. We just
need to unref it after copying it, which we do.
If we reference it again, the sample/buffer is not freed - I have seen the app
crashing while consuming most of system memory (can lead OS to out-of-memory
condition) before this commit.
2014-05-09 14:57:15 -04:00
b818fd3926
"new-sample" callback should return GstFlowReturn
2014-05-09 14:57:00 -04:00
f4ecddd664
we can assume depth and bpp of 32
2014-05-08 16:38:18 -04:00
f23fa9cb9d
add a FIXME
2014-05-08 16:14:02 -04:00
7177d62f90
remove useless endl in prints
2014-05-08 16:06:31 -04:00
4426142f80
fix pixel format bug - but playback still doesn't
2014-05-08 16:03:15 -04:00
7f1cea5553
Aparently, no need for bpp=32,depth=32
2014-05-08 15:09:22 -04:00
19b3ca3826
build against GStreamer 1.0
2014-05-08 13:03:02 -04:00
f763bf3c7c
Use only pkg-config on Linux
2014-05-08 11:26:59 -04:00
37e342e933
Use only pkg-config on Linux
2014-05-08 11:26:19 -04:00
fb4bd968b8
towards building against GStreamer 1.0 on OS X
2014-05-08 11:11:53 -04:00
06e8c57db2
MapperGLCanvas: avoid segfault on right-click with no active shape
2014-05-06 10:43:17 -04:00
011f5b205f
Additional INSTALL instructions for getting gstreamer0.10-ffmpeg on 14.04
2014-05-04 10:59:09 -04:00
88f61adee1
Update INSTALL with more packages to install
2014-05-04 10:18:20 -04:00
ad67794978
Removed reversal of data (prevented by changing the way we select texture coordinates).
2014-05-03 19:27:40 -04:00
ecce84194b
Merge branch 'gui-controls-refactor' into develop
2014-05-03 13:41:57 -04:00
17d320cfdb
Some adjustments to the selection range and line weights
2014-05-03 13:41:51 -04:00
27b41db8af
Renamed _active_vertex to _activeVertex.
2014-05-03 13:30:00 -04:00
d98eb516f4
Use method distSq and MM:: definitions for vertex selection.
2014-05-03 13:29:30 -04:00
4413e0749e
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-05-03 13:17:45 -04:00
ca78874387
Cosmetic changes
2014-05-03 13:17:00 -04:00
0711e236f6
Implemented constraining of vertices in polygons (esp. meshes) to avoid line crossing problems. Working at 99%.
2014-05-03 13:16:47 -04:00
c91a55e4e8
Fixed error in ordering of mesh vertices
2014-05-03 13:11:36 -04:00
2285716ed2
Fix bug and potential bugs with painters not being reset between draws.
2014-05-03 13:10:46 -04:00
ded32de4c1
Fixed bug: When moving vertices in the input area while a color mapping exists, we have a null pointer and it crashes.
2014-05-03 12:52:18 -04:00
711867f54d
Fixed bug: When moving vertices in the input area while a color mapping exists, we have a null pointer and it crashes.
2014-05-03 12:51:50 -04:00
Tats