diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 14:20:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 14:20:45 (GMT) |
| commit | b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d (patch) | |
| tree | f4640778e9a35cc41137f2712776e0e30432488a /src/3rdparty/phonon/mmf/abstractplayer.h | |
| parent | e393c706e1e8d9004ac3dc855b6e33327523a137 (diff) | |
| parent | 700ba679e88241ce35b16c46326a854c07ac9b8a (diff) | |
| download | Qt-b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d.zip Qt-b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d.tar.gz Qt-b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed build break on Symbian versions earlier than S^3
Fixed qsymbianbearer.qtplugin exports in s60installs.pro
Enabled tst_mediaobject::testPlayFromResource on Symbian
Added support to Phonon MMF backend for playback of Qt resource files
Diffstat (limited to 'src/3rdparty/phonon/mmf/abstractplayer.h')
| -rw-r--r-- | src/3rdparty/phonon/mmf/abstractplayer.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractplayer.h b/src/3rdparty/phonon/mmf/abstractplayer.h index 30d5243..dd98c7c 100644 --- a/src/3rdparty/phonon/mmf/abstractplayer.h +++ b/src/3rdparty/phonon/mmf/abstractplayer.h @@ -26,8 +26,6 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include "abstractvideooutput.h" -class RFile; - QT_BEGIN_NAMESPACE namespace Phonon @@ -54,7 +52,7 @@ class AbstractPlayer : public QObject public: AbstractPlayer(const AbstractPlayer *player); - virtual void open(const Phonon::MediaSource&, RFile&) = 0; + virtual void open() = 0; virtual void close() = 0; // MediaObjectInterface (implemented) |