Commit Graph

159 Commits

Author SHA1 Message Date
1ba10b7b30 fix build
Change-Id: I13c67763ec3cb940292199f3e9e0f3942446959f
2014-09-02 01:08:55 +02:00
f43d50d1e4 fdo#82994: added missing media extensions
Change-Id: Ibbce02b43192fd3afb4984f5f38251a518d7be06
Reviewed-on: https://gerrit.libreoffice.org/11172
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-08-28 08:12:33 -05:00
30ae83c268 fdo#82577: Handle KeyCode
Put the VCL KeyCode class in the vcl namespace. Avoids clash with the X11
KeyCode typedef.

Change-Id: I624c9d937f7c5f5986d313b6c5f060bd8bb7e028
2014-08-23 22:33:30 +03:00
e50bcaf729 STRING -> String
Change-Id: I084d99fdd1a34842178b59c17ab108750f7bd11d
2014-08-18 04:31:05 +02:00
1138301714 ErrorBox AVMEDIA_ERR_URL to String
Change-Id: Id897c62fbfe9728bef2264769871aade8c82dbdb
2014-08-15 23:30:20 +02:00
df5202ff19 Avoid a warning, return early on empty URL.
Change-Id: Ie4eb55fa52ee97eb98a5269658ce5183a287618b
2014-07-20 09:54:05 +02:00
fe70101856 Introduce HAVE_FEATURE_GLTF to enable/disable gltf related code
When it is a release build then enable it only on Windows and
Linux.

Change-Id: I7c462aeb75e6ab60eeaa0fa42ca7853a6369b742
2014-06-12 21:43:35 +02:00
ddb73c6137 avmedia: call resize before player window is created
Since b5529c8c457f442bfc43305becc0c02d6a09ee80
MediaChildWindow is depend on the media URL so
it is constructed later and so one resizing is
missed before creating the player window which
causes to display nothing in the media player
(Tools -> Media Player)

Change-Id: I548e6bb73193fccd1735e8343e9c06428ee686bc
2014-05-25 15:39:39 +02:00
25db60d2e4 Partly revert 4ec3554a80f065c2d9c957d6ce7f577fb195be02
mpEvents is freed by other object so using
scoped_ptr lead to crash.

Change-Id: I28c9d322b5ee5da6edf5022da18b42f59b608dec
2014-05-25 15:39:39 +02: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
4ec3554a80 avmedia: avoid segmentation fault during destruction of media window
mpEvents is not initialized in the destructor any more:
b5529c8c457f442bfc43305becc0c02d6a09ee80

Plus use scoped_ptr to stop memory leak.

Change-Id: Idaaa274e39c1ac34270ae5b0acdd237ee5aec1c3
2014-05-23 22:08:25 +02:00
3db8d606d5 hrc and src files: squeeze multiple newlines
for i in `find . -name *.src -or -name *.hrc`; do FILE=$(cat -s "$i"); echo "$FILE" > "$i"; done

Change-Id: I2bac5ad3e1eb3c566e5c867ccf45893a19e1561e
2014-05-19 20:04:22 +02:00
a0b9dbde60 Try the AVMEDIA_MANAGER_SERVICE_NAME_FALLBACK1
Change-Id: Iacd00f1371ea276758702bd5eb8380f542790c55
2014-05-15 18:49:16 +03:00
2bd7767d01 Resolves fdo#70681: fixincludeguards.pl: all that's left
Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-05-15 12:50:46 +00:00
bf703a7ef9 glTF rendering: first try to move camera position
SystemChildWindow can't handle events by its own
that's why it's parent is used as an event handler.
Mouse pointer specify the active model.
This patch made for editing, in case of slideshow
we have one less window.

Change-Id: If8ac57176b9a0abab518f8d8a06a2a41177a4881
2014-05-13 00:09:11 +02:00
22e9b1188c avmedia: fix media embedding problem in edit mode
Some of the media player interfaces don't use the given
SystemChildWindow, but they work with the parent window handle.
e.g. directx (avmedia/source/win) and
quicktime (avmedia/source/quicktime)
Without the parent window handle they create a
separate child window outside impress window.
It affects only editing and not the slideshow.

Change-Id: I80252ce35fcd29ab2cce081299529b85129017ee
2014-05-08 18:34:33 +02:00
18d4f6c9ee Use WB_CLIPCHILDREN consistently.
Change-Id: Ifd53e37d23c29efb2f084a39b48c88ea4bc0d70a
2014-05-06 03:07:50 +02:00
4f9b21248f simplify ternary conditions "xxx ? yyy : false"
Look for code like:
   xxx ? yyy : false;
Which can be simplified to:
   xxx && yyy

Change-Id: Ia33c0e452aa28af3f0658a5382895aaad0246b4d
2014-05-05 12:47:48 +02:00
3c6e2a2bd3 coverity#1210180 Uninitialized pointer field
Change-Id: Ice39630a7991bf037842557e76bfb95600c57ea3
2014-04-29 11:40:27 +01:00
0a1746e942 avmedia: make OpenGL window render model when play button is pushed.
Redraw player window (call update) when Paint() is called on its
parent.
Use a temp variable to save playing state.

Change-Id: I3d9b716c7f77587d98e4c06dca6d43a7dc8e32dd
2014-04-28 17:26:35 +02:00
e112ac81d1 First try to render OpenGL content in a window
Change-Id: Ibb7178330d356806cea2cfc972b361167d5a9340
2014-04-27 12:34:07 +02:00
b5529c8c45 avmedia: create a special SystemChildWindow for 3D models
Change-Id: Id5f5ba2cf72ea78506ba226b269fae59b1163858
2014-04-27 12:34:06 +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
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
5e21a413c7 cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-26 18:22:20 +01:00
f7a6ef74fe Remove visual noise from avmedia
Change-Id: I2f2cccc75f902359fbe557333c0062b13d1e9e96
Reviewed-on: https://gerrit.libreoffice.org/8231
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-25 17:00:26 +00:00
0ce0c369aa Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-23 03:38:49 +00:00
860b6deee0 auto_ptr -> scoped_ptr
Change-Id: Ia84ebb07de6c2b5c62340b530c908fc919b34b0a
2014-02-07 18:43:31 +01:00
59238ef422 Related: #i123862# use O*String's isEmpty() method...
to check for emptiness in modules starting with 'a'

Patch-by: j.nitschke@ok.de
Review-by: hdu@apache.org
(cherry picked from commit 40b2ffbb1036c2f2db50965525009213d8fd6343)

Conflicts:
	accessibility/source/extended/accessibleiconchoicectrl.cxx
	accessibility/source/extended/textwindowaccessibility.cxx
	accessibility/source/standard/vclxaccessiblebox.cxx
	accessibility/source/standard/vclxaccessibletoolboxitem.cxx
	automation/source/server/recorder.cxx
	automation/source/server/statemnt.cxx
	avmedia/source/framework/mediacontrol.cxx
	avmedia/source/framework/soundhandler.cxx
	avmedia/source/gstreamer/gstplayer.cxx
	avmedia/source/viewer/mediawindow.cxx

Change-Id: I8e6d6754282634f6931a2e7f73f08f70c23d452e
2014-02-04 12:14:11 +00:00
88a243a3bb fdo#72398 add m4v to allowed movie exts
Change-Id: I3a0f4cdfc8b229efb65d3aae94de9e1cabd002ec
2013-12-07 19:08:38 +01:00
55b489ccba Transport Referer from MediaWindowImpl::setURL to ...::updateMediaItem
Change-Id: I9cc6ae4fc5fc67837fcfc5fdea92baadd032996e
2013-11-20 17:54:29 +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
4e593d690d Elide some trivial avmedia::MediaWindowImpl private member functions
Change-Id: I272acbfc9ea158af1d6d6d117451a444c1585e19
2013-11-18 18:04:37 +01:00
a063da487e Simplify avmedia::MediaItem::setURL
Change-Id: I9835b96813c6bf3d8690cdaa5de66ca07afdc801
2013-11-18 17:57:39 +01:00
df4adcc47a Fix debug output
Change-Id: I785a3f223bd8897466f9402125df2da07615cd50
2013-11-18 17:02:17 +01:00
929baba5f0 Simplify MediaWindow::mpImpl
Change-Id: Ia466a08a8135a7f2e43278354c767be3a063550a
2013-11-18 17:02:17 +01:00
110bbaf044 Remove bogus comment
Change-Id: I236e5f3797750f78047957c3dd9984c687ffa0ab
2013-11-18 17:02:17 +01:00
6f405e15ec Fold MediaWindowBaseImpl into MediaWindowImpl
Change-Id: Ie6366d8b1facb39a5f44279f0c49a229b019bcaa
2013-11-18 17:02:17 +01:00
4446ee5ae0 Bin apparently unneeded #include
Change-Id: Ib459531736b0c1cccfcb3f51aa58257c2c80e991
2013-10-12 22:00:22 +03:00
507c1c9905 Resolves: rhbz#1012379 draw audio-placeholder in presentation mode
Change-Id: Ied61f9b4947e1a6eda04c442d95037cc1c7ef460
2013-10-04 20:20:55 +01:00
65f3f3a842 filters with incorrect trailing semicolons
Change-Id: Iff222839d56e8ee65b760253e8f79112ce83e9b7
2013-10-03 14:42:56 +01:00
b459655cbb CID#738557 unused mbIsMediaWindowJavaBased member
Change-Id: Ia219266bf176a71ff3a5875df318f39c3b3555ec
2013-10-03 13:18:26 +01:00
ba0d1fc481 Avmedia/VLC: Adding more debug info
Change-Id: I484050575da7e09e89a10f3a4e8d5fbe95f88044
2013-09-23 21:56:05 +03:00
3d246af83b Avmedia/VLC: Fixing a bug with a keyframe attaching
Change-Id: Iee28b510a79600e20a7e711d78ca20a216ccc3aa
2013-09-20 20:15:24 +03:00
ccea730aef Avmedia: Change a background to the black color.
Change-Id: I1edccc2436ae000571551e8d23f432a152081f7f
2013-09-20 20:15:24 +03:00
5efc15f000 reduce use of UniString from ResID ctor
Change-Id: I8d7619e7807ff2d400ec5c7fd181375130245728
2013-07-28 16:45:48 +01:00
e2376b3db0 Insert vlc at the top of the service list to try for media.
Change-Id: I2abde3c4431e104f30c22a3066bb6fb243151e2d
2013-07-26 10:50:21 +01:00
bdf1731fbb fdo#64003 - added rmi and snd to insert -> movie & sound list
RMI and SND files were already supported but were missing from the list of
movie & sound menu. Added these in alpha order

	modified:   avmedia/source/viewer/mediawindow.cxx

Change-Id: I3241f1cdd8972fb3da85e8e2bdd26b25f61a53ec
Reviewed-on: https://gerrit.libreoffice.org/3727
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-05-02 06:53:01 +00:00