Commit Graph

25 Commits

Author SHA1 Message Date
191f0944fd Handle collada libraries seperately: --disable-collada
Depends on gltf support.

Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
2014-08-07 15:42:57 +02:00
7e018afaf7 simplify return argument of SfxPoolItem::GetPresentation
since all two of the actual call-sites only care about whether
it is a valid presentation or not, not what kind of presentation it is.

Change-Id: I75717c88878d37b2897741b0c833ff283b3fee59
2014-07-29 11:04:01 +02:00
573ced4087 Extract kmz and collada converter code to a seperate function
Plus fix some problems related to temp files.
e.g. kmz converter was creating temp files next
to the input file.

Change-Id: Ib3f367fe1c4ef3cb25f5ca1c3d06b2dde78c5e45
2014-06-13 00:20:36 +02:00
b88ab17551 header guard naming consistency
Change-Id: Iebbf5c586f5d2961be98b12638def3adbadef136
2014-05-30 13:05:55 +02:00
9e3cc6b474 fdo#68849: Add header guards to all include files
Added header guard to files in directories i18npool/, include/, and io/

Change-Id: I7ba5b5f0ffdf5dedb8fd40e8efa06936e7c23591
Reviewed-on: https://gerrit.libreoffice.org/9558
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-05-30 01:45:21 -05:00
4359ec6b0b avmedia: remove unused code related to fast-forward
One part of that was removed by:
55d52165df003d253d813f3ea7085f4d89fdb3ce
e.g. setRate()

Change-Id: Ia5def0150029c1597cd505bbaf740a42819a7c73
2014-05-23 22:08:33 +02:00
1736e5d91c Slideshow: display OpenGL window also during slideshow
Use vcl based player window initialization.

Change-Id: If5c2198fa891e1d3ad218c8b7e1495161c0d6c25
2014-04-28 17:26:35 +02:00
d8920e6d1d Make OGLFrameGrabber work
Steps of grabFrame
- Init opengl context
- Call libgltf to render
- Get a RGB buffer from libgltf
- Create a Bitmap from this RGB buffer

Additionally:
- Using mimetype is neccessary to decide which player to create.
- bAllowToCreateReplacementGraphic is unneeded.

Change-Id: I7fef043a3341771389144a4f4cac71b0862ef8a7
2014-04-20 18:00:48 +02:00
f470f3c72e Introduce a new media shape property to handle mime type
Default mime-type for all media objects:
"application/vnd.sun.star.media"
The problem of missing mime-type detection
still exists. For now only glTF model has
a concrete type.

Change-Id: I4dca26c1c47a564579bbed926bffa3aa5eda6c04
2014-04-04 19:06:11 +02:00
586612e4f5 Fix mac build: "<::" cannot begin a template-argument list
Change-Id: Iddc71ca948ae478aa865378e0f3d3c7bbdcc577b
2014-04-02 12:54:03 +02:00
edb4c11b07 glTF 3D model embedding: Embed all external resources of *.json file
Store them under /Model/<json_file_name_without_extension>/
modeltools: functions for handling 3D models inside avmedia

Change-Id: Ia2bdad6064db372e1c946b6ab02c434545d1ed45
2014-04-02 12:15:49 +02:00
362d4f0cd4 Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."

Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
2014-04-01 19:22:54 +02:00
567ef6d578 Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
5fb78604c1 Split TYPEINFO into plain and TYPEINFO_OVERRIDE
...where the latter contains SAL_OVERRIDE annotations

Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
2014-03-26 11:54:55 +01:00
8792ec7b21 Remove visual noise from include
Conflicts:
	include/framework/preventduplicateinteraction.hxx
	include/sfx2/sfxbasecontroller.hxx
	include/sfx2/sfxbasemodel.hxx
	include/toolkit/awt/vclxtabpagemodel.hxx
	include/vcl/field.hxx
	include/vcl/settings.hxx

Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-01 09:51:32 -06:00
d548b250db Drop unnecessary #include
Change-Id: Ib9ab63cdf21f54b1611de37c5538a300a1b39ba6
2014-02-18 13:24:11 +09:00
d1043892df SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too.

Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
2014-01-10 17:11:51 +01:00
5668e73beb avmedia: Implement "block untrusted referer links" feature
See f0a9ca24fd4bf79cac908bf0d6fdb8905dc504db "rhbz#887420 Implement 'block
untrusted referer links' feature" for details.  This adds some further /*TODO?*/
comments, and one known problem (marked /*TODO!*/) is that movies/sounds are not
blocked during a slideshow presentation.

Change-Id: Ib2d0c7e4f7b02c4bdec0d8a90cee5e7e1bee8325
2013-11-20 14:44:27 +01:00
a063da487e Simplify avmedia::MediaItem::setURL
Change-Id: I9835b96813c6bf3d8690cdaa5de66ca07afdc801
2013-11-18 17:57:39 +01:00
929baba5f0 Simplify MediaWindow::mpImpl
Change-Id: Ia466a08a8135a7f2e43278354c767be3a063550a
2013-11-18 17:02:17 +01:00
c37d7f0d50 avmedia::getMediaFloater clean-up
Change-Id: I76dcf42267cbb1f028d0501471b569fa6b7b91d5
2013-11-18 17:02:16 +01:00
8f704dedab fdo#65108 inter-module includes <> include/avmedia
Change-Id: I522ca533e7b47de1960d47ea90c93b2c50b858e4
2013-11-09 18:48:52 -06:00
1130a359cb fixincludeguards.sh: include - the rest
Change-Id: If1ee11da444a7f96f2d8668b277540da0bb4dbe9
2013-10-23 23:22:31 +02:00
507c1c9905 Resolves: rhbz#1012379 draw audio-placeholder in presentation mode
Change-Id: Ied61f9b4947e1a6eda04c442d95037cc1c7ef460
2013-10-04 20:20:55 +01:00
b9337e22ce execute move of global headers
see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
2013-04-23 22:20:31 +02:00