phonon:phonon-vlc.git
6 years agoMerge branch 'master' of git://gitorious.org/phonon/phonon-vlc
Harald Sitter [Wed, 15 Dec 2010 14:18:09 +0000 (15:18 +0100)]
Merge branch 'master' of git://gitorious.org/phonon/phonon-vlc

6 years agosetting version to 0.3-gt
Harald Sitter [Mon, 13 Dec 2010 13:59:25 +0000 (14:59 +0100)]
setting version to 0.3-gt

6 years agoForce cdda:// when playing an Audio-CD
Jean-Baptiste Kempf [Wed, 1 Dec 2010 18:47:39 +0000 (19:47 +0100)]
Force cdda:// when playing an Audio-CD

At least, the right access module is called

6 years agoDo not default to experimental 0.3.1
Harald Sitter [Tue, 30 Nov 2010 21:31:17 +0000 (22:31 +0100)]
Do not default to experimental

6 years agoOnly shutdown pulsesupport if built with pulse
Harald Sitter [Tue, 30 Nov 2010 21:30:16 +0000 (22:30 +0100)]
Only shutdown pulsesupport if built with pulse

6 years agoadd uninstall support 0.3.0
Harald Sitter [Tue, 30 Nov 2010 13:25:52 +0000 (14:25 +0100)]
add uninstall support

6 years agofix linking, no clue how the project value plays into that...
Harald Sitter [Tue, 30 Nov 2010 13:25:03 +0000 (14:25 +0100)]
fix linking, no clue how the project value plays into that...

6 years agoBackend dtor needs to shutdown pulsesupport
Harald Sitter [Mon, 29 Nov 2010 09:14:55 +0000 (10:14 +0100)]
Backend dtor needs to shutdown pulsesupport

6 years agostyle fix
Harald Sitter [Mon, 29 Nov 2010 09:10:58 +0000 (10:10 +0100)]
style fix

6 years agocall cmake project PhononVLC, QtCreator uses the project name as project name ;)
Harald Sitter [Mon, 29 Nov 2010 08:34:59 +0000 (09:34 +0100)]
call cmake project PhononVLC, QtCreator uses the project name as project name ;)

6 years agoreset the total time when a new file is being played. fixes streams
Arno Rehn [Fri, 26 Nov 2010 15:22:47 +0000 (16:22 +0100)]
reset the total time when a new file is being played. fixes streams
not updating the metadata when a local file has been played before.

7 years agoRevert "Disable usage of Xlib"
Mark Kretschmann [Fri, 12 Nov 2010 06:03:46 +0000 (07:03 +0100)]
Revert "Disable usage of Xlib"

This reverts commit 3b1835d70aa38e4d86bcb9024c365e6b353766e4.

This revert was recommended by j-b, as the commit broke Phonon-VLC in many cases.
(mine didn't work at all).

7 years agoonly use #warning if __GNUC__ is defined, that said, I should probably fix the warni...
Harald Sitter [Wed, 10 Nov 2010 22:28:58 +0000 (23:28 +0100)]
only use #warning if __GNUC__ is defined, that said,  I should probably fix the warning at some point ....

7 years agoFix .gitignore
Rémi Denis-Courmont [Sat, 30 Oct 2010 14:57:00 +0000 (17:57 +0300)]
Fix .gitignore

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
7 years agoDisable usage of Xlib
Rémi Denis-Courmont [Sat, 30 Oct 2010 14:56:59 +0000 (17:56 +0300)]
Disable usage of Xlib

Close #240001

VLC plugins call XInitThreads() before XOpenDisplay(). As per the
Xlib documentation, this is required to use Xlib from more than one
thread in a single process, which is to say any other thread besides
the Qt main loop thread. Do note that, contrary to XLockDisplay(),
XInitThreads() _must_ be called even if Display pointers are not
shared across threads. In fact, XInitThreads() initialize locks around
static data within Xlib.

Unfortunately, XCloseDisplay() will crash if XInitThreads() is
called for the first time only after XOpenDisplay(). By design,
XInitThreads() must be called from main() before Qt or anything else
uses Xlib. Phonon cannot force the main application to call
XInitThreads(), and indeed none that I know do it correctly today.

As an alternative, VLC provides an undocumented --no-xlib option. It
blacklists all VLC plugins that call XInitThreads() because they are
known to depend on Xlib. This is the only viable solution that does not
involve changing libQtGUI, libX11 and/or all Phonon applications.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
7 years agoDo not set any VLC interface
Rémi Denis-Courmont [Sat, 30 Oct 2010 14:56:58 +0000 (17:56 +0300)]
Do not set any VLC interface

libvlc does not start any interface out of the box. This statement
has no effects in Phonon.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
7 years agoDo not pass --ignore-config
Rémi Denis-Courmont [Sat, 30 Oct 2010 14:56:57 +0000 (17:56 +0300)]
Do not pass --ignore-config

This is already the default for libvlc >= 1.1.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
7 years agofixed typo which prevented compilation on windows
Patrick von Reth [Mon, 18 Oct 2010 08:33:38 +0000 (10:33 +0200)]
fixed typo which prevented compilation on windows

7 years agoImprovement for streams input in PhononVLC
Jean-Baptiste Kempf [Sun, 17 Oct 2010 20:20:27 +0000 (22:20 +0200)]
Improvement for streams input in PhononVLC

7 years agoCMake: correctly flag and compile if no experimental version of phonon is found
Jean-Baptiste Kempf [Sun, 17 Oct 2010 20:13:07 +0000 (22:13 +0200)]
CMake: correctly flag and compile if no experimental version of phonon is found

7 years agoFix initial i_total_time value, so that aboutToFinish() is not fired too early, espec...
Arno Rehn [Sat, 9 Oct 2010 19:33:28 +0000 (21:33 +0200)]
Fix initial i_total_time value, so that aboutToFinish() is not fired too early, especially for streams

7 years agoImprove metadata for 'nowplaying' streams
Arno Rehn [Sat, 9 Oct 2010 18:24:56 +0000 (20:24 +0200)]
Improve metadata for 'nowplaying' streams

7 years agoDo not crash when removing nodes
Jean-Baptiste Kempf [Sun, 17 Oct 2010 18:22:32 +0000 (20:22 +0200)]
Do not crash when removing nodes

Close #235057

7 years agoAvoid a crash if the vlcinstance wasn't created yet.
Jean-Baptiste Kempf [Sun, 17 Oct 2010 18:05:47 +0000 (20:05 +0200)]
Avoid a crash if the vlcinstance wasn't created yet.

Close #247092

7 years agoTry to emit aboutToFinish() before finish(), to make sure it was emitted
Harald Sitter [Tue, 12 Oct 2010 15:16:35 +0000 (17:16 +0200)]
Try to emit aboutToFinish() before finish(), to make sure it was emitted
at all. Amarok currently depends on aboutToFinish to be emitted to
proceed in the playlist.

7 years agoIntroducing emitAboutToFinish to make emission of aboutToFinish also
Harald Sitter [Tue, 12 Oct 2010 15:15:19 +0000 (17:15 +0200)]
Introducing emitAboutToFinish to make emission of aboutToFinish also
condition to its associated bool being false, even for calls from
outside (obviously then this function must be used ;))

7 years agoEmit signals before changing states.
Harald Sitter [Tue, 12 Oct 2010 14:57:39 +0000 (16:57 +0200)]
Emit signals before changing states.

7 years agoWidgetNoPaintEvent -> OverlayWidget
Harald Sitter [Tue, 12 Oct 2010 13:08:43 +0000 (15:08 +0200)]
WidgetNoPaintEvent -> OverlayWidget

7 years agoReimplement QWidget::paintEvent as protected, rather than private.
Harald Sitter [Tue, 12 Oct 2010 13:03:43 +0000 (15:03 +0200)]
Reimplement QWidget::paintEvent as protected, rather than private.

7 years agoInitialize the customrender bool to false and ensure PaintEvents get
Harald Sitter [Tue, 12 Oct 2010 13:02:10 +0000 (15:02 +0200)]
Initialize the customrender bool to false and ensure PaintEvents get
forwarded to widgetnopaintevent. This makes Sho a happy user again, I am
certain.

7 years agofixed ident
Patrick von Reth [Mon, 4 Oct 2010 08:38:53 +0000 (10:38 +0200)]
fixed ident

7 years agoadded QCoreApplication::applicationDirPath() to the libvlc searchPath
Patrick von Reth [Sun, 3 Oct 2010 14:06:57 +0000 (16:06 +0200)]
added QCoreApplication::applicationDirPath() to the libvlc searchPath

7 years agocleanup++
Harald Sitter [Fri, 1 Oct 2010 11:25:39 +0000 (13:25 +0200)]
cleanup++

7 years agoSome license header alignment.
Harald Sitter [Fri, 1 Oct 2010 11:24:05 +0000 (13:24 +0200)]
Some license header alignment.

7 years agoCleanup includes a bit more
Harald Sitter [Fri, 1 Oct 2010 11:22:29 +0000 (13:22 +0200)]
Cleanup includes a bit more

7 years agoCleanup includes.
Harald Sitter [Fri, 1 Oct 2010 11:21:56 +0000 (13:21 +0200)]
Cleanup includes.

7 years agoCommit somewhat more working videodataoutput code.
Harald Sitter [Fri, 1 Oct 2010 11:15:24 +0000 (13:15 +0200)]
Commit somewhat more working videodataoutput code.

Implementation is largely based on what is in VideoWidget right now and only supports a static size of 300x300.
Building remains dorment for the time being.

7 years agofixed msvc kdewin linking
Patrick von Reth [Tue, 21 Sep 2010 08:33:43 +0000 (10:33 +0200)]
fixed msvc kdewin linking

7 years agoMake Phonon-VLC build with stable Phonon version from KDE 4.5.
Mark Kretschmann [Mon, 20 Sep 2010 11:14:00 +0000 (13:14 +0200)]
Make Phonon-VLC build with stable Phonon version from KDE 4.5.

You have to use "-DPHONON_VLC_NO_EXPERIMENTAL=true" as CMake argument.

Please let me know if this patch causes problems, so far it seems to work
here.

7 years agofix cmake warning on if with mismatching arguments
Harald Sitter [Sat, 18 Sep 2010 09:32:36 +0000 (11:32 +0200)]
fix cmake warning on if with mismatching arguments

7 years agoMerge branch 'master' of gitorious.org:phonon/phonon-vlc
Harald Sitter [Wed, 15 Sep 2010 20:02:30 +0000 (22:02 +0200)]
Merge branch 'master' of gitorious.org:phonon/phonon-vlc

7 years agofix broken merge
Martin Sandsmark [Thu, 9 Sep 2010 15:21:16 +0000 (17:21 +0200)]
fix broken merge

7 years agoreturn a null picture identifier in the lock video callback
Harald Sitter [Thu, 9 Sep 2010 12:39:39 +0000 (14:39 +0200)]
return a null picture identifier in the lock video callback

7 years agoPhota: add a VideoEffect class and dialog
Jean-Baptiste Kempf [Wed, 25 Aug 2010 10:46:18 +0000 (12:46 +0200)]
Phota: add a VideoEffect class and dialog

So we can test the adjust* in the phonon-VLC backend

7 years agouse vlc as icon, pending a phonon-vlc icon
Harald Sitter [Sat, 21 Aug 2010 06:36:34 +0000 (08:36 +0200)]
use vlc as icon, pending a phonon-vlc icon

7 years agomore on variable naming, also make events protected and virutal rather than private
Harald Sitter [Sat, 21 Aug 2010 06:11:26 +0000 (08:11 +0200)]
more on variable naming, also make events protected and virutal rather than private

7 years agodocumentation and variable naming fixes
Harald Sitter [Sat, 21 Aug 2010 06:05:44 +0000 (08:05 +0200)]
documentation and variable naming fixes

7 years agoadd missing include
Harald Sitter [Sat, 21 Aug 2010 05:51:44 +0000 (07:51 +0200)]
add missing include

7 years agoastyle format everything
Harald Sitter [Sat, 21 Aug 2010 05:49:47 +0000 (07:49 +0200)]
astyle format everything

Applied settings are based on kdelibs and Qt:
astyle --indent=spaces=4 --brackets=linux --pad-header \
       --align-pointer=name --pad=oper --unpad=paren \
       --one-line=keep-statements --convert-tabs \
       --lineend=linux

7 years agoinclude own header first
Harald Sitter [Sat, 21 Aug 2010 05:26:42 +0000 (07:26 +0200)]
include own header first

7 years agoComment spelling fixes
Harald Sitter [Sat, 21 Aug 2010 05:19:15 +0000 (07:19 +0200)]
Comment spelling fixes

7 years agowarning--
Harald Sitter [Fri, 20 Aug 2010 17:53:35 +0000 (19:53 +0200)]
warning--

7 years agocomment--
Harald Sitter [Fri, 20 Aug 2010 17:39:24 +0000 (19:39 +0200)]
comment--

7 years agosaner format for findlibvlc && use pkconfig on non-windows architectures
Harald Sitter [Thu, 19 Aug 2010 17:45:38 +0000 (19:45 +0200)]
saner format for findlibvlc && use pkconfig on non-windows architectures

7 years agoadd custom video paintaing capabilities
Harald Sitter [Thu, 19 Aug 2010 16:35:39 +0000 (18:35 +0200)]
add custom video paintaing capabilities

Custom painting will be used whenever overlay is disabled, which is for example the case with QtWebKit, in those cases videowidgets hooks up with VLC and sends each frame vlcvideowidget which can then paint the frame.

7 years agofix header order
Harald Sitter [Thu, 19 Aug 2010 15:34:17 +0000 (17:34 +0200)]
fix header order

7 years agoPass videowidget to vlcvideowidget for arranging dates via calls ;)
Harald Sitter [Thu, 19 Aug 2010 15:32:25 +0000 (17:32 +0200)]
Pass videowidget to vlcvideowidget for arranging dates via calls ;)

7 years agorevert to calling pause() in resume() but be explicit about resuming or pausing
Harald Sitter [Thu, 19 Aug 2010 14:30:45 +0000 (16:30 +0200)]
revert to calling pause() in resume() but be explicit about resuming or pausing

In particular if the statue is PausedState it will now explicitly try to resume/play and if not it will try to explicitly pause. This approach still leaves thing sto be desired though since the player's media will be nil unless playInternal() gets called, so one could call pause but without actually pausing or resuming anything, while pause on a not yet played media might very well be intent to play && pause. This is to be taken into account and ultimately loading would imply buffering so that either resume or pause would have a result.

7 years agoprefix member vars with m_
Harald Sitter [Wed, 18 Aug 2010 11:15:04 +0000 (13:15 +0200)]
prefix member vars with m_

7 years agono tabs, kthxbai
Harald Sitter [Wed, 18 Aug 2010 11:07:45 +0000 (13:07 +0200)]
no tabs, kthxbai

7 years agoupdate videowidget's geometry and the widget itself when the video size
Harald Sitter [Tue, 17 Aug 2010 20:55:13 +0000 (22:55 +0200)]
update videowidget's geometry and the widget itself when the video size
changes

7 years agoReturn a somewhat sensible default sizehint when videosize is unkown
Harald Sitter [Tue, 17 Aug 2010 19:52:19 +0000 (21:52 +0200)]
Return a somewhat sensible default sizehint when videosize is unkown

7 years agoemit appropriate stateChanged() signals in play, pause and stop
Harald Sitter [Tue, 17 Aug 2010 14:02:53 +0000 (16:02 +0200)]
emit appropriate stateChanged() signals in play, pause and stop

This makes HTML5's audio tag work properly in QtWebKit since it depends on correct states. Video playback has some widget problem though...

7 years agoMediaObject::resume() ought to call playInternal not pause
Harald Sitter [Tue, 17 Aug 2010 13:59:17 +0000 (15:59 +0200)]
MediaObject::resume() ought to call playInternal not pause

7 years agoPhota: a small Phonon Testing Application for VLC debugging
Jean-Baptiste Kempf [Sat, 14 Aug 2010 18:11:30 +0000 (20:11 +0200)]
Phota: a small Phonon Testing Application for VLC debugging

7 years agoDo not call video_setdrawable functions when there is no need to.
Jean-Baptiste Kempf [Sat, 14 Aug 2010 16:21:06 +0000 (18:21 +0200)]
Do not call video_setdrawable functions when there is no need to.

7 years agoRearrangement in vlc/CMakeLists 9
Casian Andrei [Thu, 12 Aug 2010 12:02:56 +0000 (15:02 +0300)]
Rearrangement in vlc/CMakeLists

7 years agoMerge branches 'master' and 'alsacap'
Casian Andrei [Tue, 10 Aug 2010 09:48:56 +0000 (12:48 +0300)]
Merge branches 'master' and 'alsacap'

7 years agoDo not explode in Audio apps
Jean-Baptiste Kempf [Fri, 6 Aug 2010 16:52:15 +0000 (18:52 +0200)]
Do not explode in Audio apps

Should close #246188

But, why setVideoWidget in all situations? why, why, why?

7 years agoSpecify icons for capture devices
Casian Andrei [Fri, 6 Aug 2010 16:29:34 +0000 (19:29 +0300)]
Specify icons for capture devices

7 years agoReindentation
Jean-Baptiste Kempf [Fri, 6 Aug 2010 16:24:00 +0000 (18:24 +0200)]
Reindentation

7 years agoExclude comma from percent encoding from loadMediaInternal(), necessary for ALSA...
Casian Andrei [Fri, 6 Aug 2010 12:35:57 +0000 (15:35 +0300)]
Exclude comma from percent encoding from loadMediaInternal(), necessary for ALSA devices

7 years agoChange driver name for Pulse to lower case
Casian Andrei [Fri, 6 Aug 2010 11:16:09 +0000 (14:16 +0300)]
Change driver name for Pulse to lower case

7 years agoReplace type and hwname properties with the generic deviceAccessList property, plus...
Casian Andrei [Fri, 6 Aug 2010 11:12:49 +0000 (14:12 +0300)]
Replace type and hwname properties with the generic deviceAccessList property, plus elegant renames for capture api

7 years agoTry to load MediaSource of type alsa
Casian Andrei [Wed, 4 Aug 2010 17:29:55 +0000 (20:29 +0300)]
Try to load MediaSource of type alsa

7 years agoFix crash when there is no video widget configured for VLCMediaObject
Casian Andrei [Wed, 4 Aug 2010 15:55:04 +0000 (18:55 +0300)]
Fix crash when there is no video widget configured for VLCMediaObject

7 years agoRename experimental definition to PHONON_VLC_NO_EXPERIMENTAL
Casian Andrei [Wed, 4 Aug 2010 15:39:13 +0000 (18:39 +0300)]
Rename experimental definition to PHONON_VLC_NO_EXPERIMENTAL

7 years agoRemove unused variables in device scan
Casian Andrei [Mon, 2 Aug 2010 15:31:40 +0000 (18:31 +0300)]
Remove unused variables in device scan

7 years agoMark the cmake cache variables for experimental as advanced
Casian Andrei [Mon, 2 Aug 2010 09:52:23 +0000 (12:52 +0300)]
Mark the cmake cache variables for experimental as advanced

7 years agoImprove scandevices, no useless namespace
Casian Andrei [Mon, 2 Aug 2010 09:49:29 +0000 (12:49 +0300)]
Improve scandevices, no useless namespace

7 years agoRename v4l2devices to devicescan, for a more generic file
Casian Andrei [Mon, 2 Aug 2010 09:24:30 +0000 (12:24 +0300)]
Rename v4l2devices to devicescan, for a more generic file

7 years agoDocumented DeviceInfo::deviceClassString()
Casian Andrei [Wed, 28 Jul 2010 07:58:20 +0000 (10:58 +0300)]
Documented DeviceInfo::deviceClassString()

7 years agoDocumented DeviceManager
Casian Andrei [Thu, 8 Jul 2010 17:07:06 +0000 (20:07 +0300)]
Documented DeviceManager

7 years agoDocumented v4l2devices.h
Casian Andrei [Mon, 12 Jul 2010 11:16:37 +0000 (14:16 +0300)]
Documented v4l2devices.h

7 years agoRename AVCapture to AvCapture
Casian Andrei [Sun, 25 Jul 2010 17:36:38 +0000 (20:36 +0300)]
Rename AVCapture to AvCapture

7 years agoPut disconnections from AVCapture for VideoWidget, AudioOutput, AudioDataOutput
Casian Andrei [Tue, 20 Jul 2010 19:00:52 +0000 (22:00 +0300)]
Put disconnections from AVCapture for VideoWidget, AudioOutput, AudioDataOutput

7 years agoConnect AudioDataOutput only to audio media of AVCapture
Casian Andrei [Tue, 20 Jul 2010 18:50:44 +0000 (21:50 +0300)]
Connect AudioDataOutput only to audio media of AVCapture

7 years agoMake VideoWidget and AudioOutput to connect only to the good media object from AVCapture
Casian Andrei [Tue, 20 Jul 2010 18:44:47 +0000 (21:44 +0300)]
Make VideoWidget and AudioOutput to connect only to the good media object from AVCapture

7 years agoReorder connection methods in sinknode.cpp
Casian Andrei [Tue, 20 Jul 2010 17:58:35 +0000 (20:58 +0300)]
Reorder connection methods in sinknode.cpp

7 years agoFix omission for experimental backend objects
Casian Andrei [Tue, 20 Jul 2010 17:51:24 +0000 (20:51 +0300)]
Fix omission for experimental backend objects

7 years agoPut static cast for experimental classes in Backend::createObject()
Casian Andrei [Tue, 20 Jul 2010 15:30:37 +0000 (18:30 +0300)]
Put static cast for experimental classes in Backend::createObject()

7 years agoRename AvCapture from Phonon to AVCapture
Casian Andrei [Mon, 19 Jul 2010 17:25:56 +0000 (20:25 +0300)]
Rename AvCapture from Phonon to AVCapture

7 years agoPut AVCapture in createObject() in Backend
Casian Andrei [Sun, 18 Jul 2010 13:45:03 +0000 (16:45 +0300)]
Put AVCapture in createObject() in Backend

7 years agoFix typo for #endif
Casian Andrei [Sun, 18 Jul 2010 13:14:47 +0000 (16:14 +0300)]
Fix typo for #endif

7 years agoAdd connections for AVCapture. Fix major issues with it.
Casian Andrei [Sun, 18 Jul 2010 13:11:34 +0000 (16:11 +0300)]
Add connections for AVCapture. Fix major issues with it.

Also modified the experimental subdir

7 years agoAdd definition for experimental
Casian Andrei [Sun, 18 Jul 2010 10:44:01 +0000 (13:44 +0300)]
Add definition for experimental

7 years agoIntuitive implementation for AVCapture
Casian Andrei [Sun, 18 Jul 2010 10:29:51 +0000 (13:29 +0300)]
Intuitive implementation for AVCapture

7 years agoAdd AVCaptureInterface methods for AVCapture
Casian Andrei [Sun, 18 Jul 2010 09:57:55 +0000 (12:57 +0300)]
Add AVCaptureInterface methods for AVCapture

7 years agoAdd AVCapture skeleton
Casian Andrei [Sat, 17 Jul 2010 18:16:48 +0000 (21:16 +0300)]
Add AVCapture skeleton

7 years agoAdjustments for experimental dir
Casian Andrei [Sat, 17 Jul 2010 18:13:14 +0000 (21:13 +0300)]
Adjustments for experimental dir