[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kmplayer/0.12] src: Merge remote-tracking branch 'origin/0.11' into 0.12
From: Koos Vriezen <koos.vriezen () gmail ! com>
Date: 2016-09-18 10:22:36
Message-ID: E1blZF6-0000Dh-8J () code ! kde ! org
[Download RAW message or body]
Git commit 8531d0c90bf588fbdb9775e7f2b6382551668243 by Koos Vriezen.
Committed on 18/09/2016 at 10:21.
Pushed by vriezen into branch '0.12'.
Merge remote-tracking branch 'origin/0.11' into 0.12
M +8 -8 src/kmplayerconfig.h
M +23 -23 src/kmplayercontrolpanel.h
M +3 -2 src/kmplayerpartbase.cpp
M +28 -28 src/kmplayerpartbase.h
M +1 -1 src/kmplayerplaylist.cpp
M +32 -32 src/kmplayerprocess.h
M +17 -17 src/kmplayerview.h
M +1 -1 src/mediaobject.cpp
M +13 -13 src/mediaobject.h
M +21 -21 src/playlistview.h
M +41 -41 src/viewarea.h
http://commits.kde.org/kmplayer/8531d0c90bf588fbdb9775e7f2b6382551668243
diff --cc src/kmplayercontrolpanel.h
index bc8f600,0afb8fa..8b49e7d
--- a/src/kmplayercontrolpanel.h
+++ b/src/kmplayercontrolpanel.h
@@@ -53,10 -55,10 +53,10 @@@ protected
/*
* The pop down menu from the controlpanel
*/
-class KMPLAYER_EXPORT KMPlayerPopupMenu : public KMenu {
+class KMPLAYER_EXPORT KMPlayerPopupMenu : public QMenu {
Q_OBJECT
public:
- KMPlayerPopupMenu (QWidget *, const QString &title);
+ KMPlayerPopupMenu(QWidget*, const QString& title) KDE_NO_CDTOR_EXPORT;
KDE_NO_CDTOR_EXPORT ~KMPlayerPopupMenu () {}
signals:
void mouseLeft ();
@@@ -105,12 -107,11 +105,12 @@@ public
void showPositionSlider (bool show);
void enableSeekButtons (bool enable);
void enableRecordButtons (bool enable);
+ void enableFullscreenButton(bool enable);
void setPlaying (bool play);
- void setRecording (bool record);
+ void setRecording (bool record) KDE_NO_EXPORT;
void setAutoControls (bool b);
- void setPalette (const QPalette &);
- int preferredHeight ();
+ void setPalette (const QPalette &) KDE_NO_EXPORT;
+ int preferredHeight () KDE_NO_EXPORT;
KDE_NO_EXPORT bool autoControls () const { return m_auto_controls; }
KDE_NO_EXPORT QSlider * positionSlider () const { return m_posSlider; }
KDE_NO_EXPORT QSlider * contrastSlider () const { return m_contrastSlider; }
diff --cc src/kmplayerpartbase.cpp
index 3f4929e,fd7b363..786c779
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@@ -467,12 -468,9 +467,13 @@@ qlonglong PartBase::length () const
return m_source ? m_source->length () : 0;
}
+bool PartBase::openUrl (const QUrl &url) {
+ return openUrl(KUrl(url));
+}
+
bool PartBase::openUrl (const KUrl &url) {
kDebug () << "PartBase::openUrl " << url.url() << url.isValid ();
+ fprintf(stderr, "PartBase::openUrl %s pretty %s valid %d\n", \
qPrintable(url.url()), qPrintable(url.prettyUrl()), url.isValid ()); if (!m_view) \
return false; stop ();
Source * src = (url.isEmpty () ? m_sources ["urlsource"] : (!url.protocol \
().compare ("kmplayer") && m_sources.contains (url.host ()) ? m_sources [url.host ()] \
: m_sources ["urlsource"]));
diff --cc src/kmplayerpartbase.h
index 0e50731,9190db7..33768d8
--- a/src/kmplayerpartbase.h
+++ b/src/kmplayerpartbase.h
@@@ -57,161 -55,6 +57,161 @@@ class PlayModel
class Settings;
class MediaManager;
+
+/**
+ * Class for a certain media, like URL, DVD, TV etc
+ */
+class KMPLAYER_EXPORT Source : public QObject, public PlayListNotify {
+ Q_OBJECT
+public:
+ struct LangInfo {
+ LangInfo (int i, const QString & n) : id (i), name (n) {}
+ int id; QString name; SharedPtr <LangInfo> next;
+ };
+ typedef SharedPtr <LangInfo> LangInfoPtr;
+
+ Source (const QString & name, PartBase * player, const char * src);
+ virtual ~Source ();
+ virtual void init ();
+ virtual bool processOutput (const QString & line);
+
+ bool identified () const { return m_identified; }
+ virtual bool hasLength ();
+ virtual bool isSeekable ();
+
+ KDE_NO_EXPORT int width () const { return m_width; }
+ KDE_NO_EXPORT int height () const { return m_height; }
+ virtual void dimensions (int & w, int & h) { w = m_width; h = m_height; }
+ /* length () returns length in deci-seconds */
+ KDE_NO_EXPORT int length () const { return m_length; }
+ /* position () returns position in deci-seconds */
+ KDE_NO_EXPORT int position () const { return m_position; }
+ KDE_NO_EXPORT float aspect () const { return m_aspect; }
+ KDE_NO_EXPORT const KUrl & url () const { return m_url; }
+ KDE_NO_EXPORT const KUrl & subUrl () const { return m_sub_url; }
+ PartBase * player () { return m_player; }
+ virtual void reset ();
+ KDE_NO_EXPORT const QString & audioDevice () const { return m_audiodevice; }
+ KDE_NO_EXPORT const QString & videoDevice () const { return m_videodevice; }
+ KDE_NO_EXPORT const QString & videoNorm () const { return m_videonorm; }
+ /* frequency() if set, returns frequency in kHz */
+ KDE_NO_EXPORT int frequency () const { return m_frequency; }
+ KDE_NO_EXPORT int xvPort () const { return m_xvport; }
+ KDE_NO_EXPORT int xvEncoding () const { return m_xvencoding; }
+ KDE_NO_EXPORT int audioLangId () const { return m_audio_id; }
+ KDE_NO_EXPORT int subTitleId () const { return m_subtitle_id; }
+ KDE_NO_EXPORT const QString & pipeCmd () const { return m_pipecmd; }
+ KDE_NO_EXPORT const QString & options () const { return m_options; }
+ KDE_NO_EXPORT const QString & recordCmd () const { return m_recordcmd; }
+ KDE_NO_EXPORT const QString & tuner () const { return m_tuner; }
+ KDE_NO_EXPORT const char* name() const { return m_name; }
+ KDE_NO_EXPORT Mrl *current() { return m_current ? m_current->mrl() : NULL;}
+ virtual void setCurrent (Mrl *mrl);
+ QString plugin (const QString &mime) const;
+ virtual NodePtr document ();
+ void setDocument (KMPlayer::NodePtr doc, KMPlayer::NodePtr cur);
+ virtual NodePtr root ();
+ virtual QString filterOptions ();
+ virtual bool authoriseUrl (const QString &url);
+
+ virtual void setUrl (const QString &url);
+ void insertURL (NodePtr mrl, const QString & url, const QString & \
title=QString()); + KDE_NO_EXPORT void setSubURL (const KUrl & url) { m_sub_url = \
url; }
- void setLanguages (LangInfoPtr alang, LangInfoPtr slang);
++ void setLanguages (LangInfoPtr alang, LangInfoPtr slang) KDE_NO_EXPORT;
+ KDE_NO_EXPORT void setWidth (int w) { m_width = w; }
+ KDE_NO_EXPORT void setHeight (int h) { m_height = h; }
+ virtual void setDimensions (NodePtr, int w, int h);
+ virtual void setAspect (NodePtr, float a);
+ /* setLength (len) set length in deci-seconds */
+ void setLength (NodePtr, int len);
+ /* setPosition (pos) set position in deci-seconds */
- void setPosition (int pos);
++ void setPosition (int pos) KDE_NO_EXPORT;
+ virtual void setIdentified (bool b = true);
+ KDE_NO_EXPORT void setAutoPlay (bool b) { m_auto_play = b; }
+ KDE_NO_EXPORT bool autoPlay () const { return m_auto_play; }
+ KDE_NO_EXPORT void setAvoidRedirects (bool b) { m_avoid_redirects = b; }
+ KDE_NO_EXPORT bool avoidRedirects () const { return m_avoid_redirects; }
+ void setTitle (const QString & title);
- void setLoading (int percentage);
++ void setLoading (int percentage) KDE_NO_EXPORT;
+
+ virtual QString prettyName ();
+ virtual void activate () = 0;
+ virtual void deactivate () = 0;
+ virtual void forward ();
+ virtual void backward ();
+ /**
+ * Play at node position
+ */
+ virtual void play (Mrl *);
+signals:
+ void startPlaying ();
+ void stopPlaying ();
+ /**
+ * Signal for notifying this source is at the end of play items
+ */
+ void endOfPlayItems ();
+ void dimensionsChanged ();
+ void titleChanged (const QString & title);
+public slots:
+ void slotActivate ();
- void setAudioLang (int);
- void setSubtitle (int);
++ void setAudioLang (int) KDE_NO_EXPORT;
++ void setSubtitle (int) KDE_NO_EXPORT;
+protected:
+ void timerEvent (QTimerEvent *);
+ /**
+ * PlayListNotify implementation
+ */
+ void stateElementChanged (Node * element, Node::State os, Node::State ns);
+ void bitRates (int & preferred, int & maximal);
+ void setTimeout (int ms);
+ void openUrl (const KUrl &url, const QString &target, const QString &srv);
+ void enableRepaintUpdaters (bool enable, unsigned int off_time);
+
+ NodePtr m_document;
+ NodePtrW m_current;
+ const char* m_name;
+ PartBase * m_player;
+ QString m_recordcmd;
+ bool m_identified;
+ bool m_auto_play;
+ bool m_avoid_redirects;
+ KUrl m_url;
+ KUrl m_sub_url;
+ QString m_audiodevice;
+ QString m_videodevice;
+ QString m_videonorm;
+ QString m_tuner;
+ int m_frequency;
+ int m_xvport;
+ int m_xvencoding;
+ int m_audio_id;
+ int m_subtitle_id;
+ QString m_pipecmd;
+ QString m_options;
+ QString m_plugin;
+ LangInfoPtr m_audio_infos;
+ LangInfoPtr m_subtitle_infos;
+private:
+ int m_width;
+ int m_height;
+ float m_aspect;
+ int m_length;
+ int m_position;
+ int m_doc_timer;
+private slots:
+ void changedUrl();
+};
+
+class KMPLAYER_EXPORT SourceDocument : public Document {
+public:
+ SourceDocument (Source *s, const QString &url);
+
+ void message (MessageType msg, void *data=NULL);
+ void *role (RoleType msg, void *data=NULL);
+protected:
+ Source *m_source;
+ ConnectionList m_KeyListeners;
+};
/*
* Source from URLs
*/
@@@ -279,9 -122,9 +279,9 @@@ public
void updateStatus (const QString & msg);
// these are called from Process
- void changeURL (const QString & url);
+ void changeURL (const QString & url) KDE_NO_EXPORT;
void updateTree (bool full=true, bool force=false);
- void setLanguages(const QStringList& alang, const QStringList& slang) \
KDE_NO_EXPORT; + void setLanguages (const QStringList & alang, const QStringList \
& slang); void recorderPlaying ();
void recorderStopped ();
void stopRecording ();
@@@ -301,15 -143,15 +301,15 @@@ public slots
void adjustVolume (int incdec);
bool playing () const;
void showConfigDialog ();
- void showPlayListWindow ();
- void slotPlayerMenu (QAction*);
+ void showPlayListWindow () KDE_NO_EXPORT;
+ void slotPlayerMenu (QAction*) KDE_NO_EXPORT;
void back ();
void forward ();
- void addBookMark (const QString & title, const QString & url);
- void volumeChanged (int);
+ void addBookMark (const QString & title, const QString & url) KDE_NO_EXPORT;
+ void volumeChanged (int) KDE_NO_EXPORT;
void increaseVolume ();
void decreaseVolume ();
- void setPosition (int position, int length);
- void setPosition(int position, int length) KDE_NO_EXPORT;
++ void setPosition (int position, int length) KDE_NO_EXPORT;
virtual void setLoaded (int percentage);
virtual void processCreated (Process *);
public:
diff --cc src/kmplayerview.h
index c1216a2,3ac0df4..8d42bfb
--- a/src/kmplayerview.h
+++ b/src/kmplayerview.h
@@@ -157,9 -156,8 +157,9 @@@ signals
void windowVideoConsoleToggled (bool show);
protected:
void leaveEvent (QEvent *) KDE_NO_EXPORT;
- void timerEvent (QTimerEvent *) KDE_NO_EXPORT;
+ void timerEvent(QTimerEvent*) KDE_NO_EXPORT;
private:
+ QByteArray m_dock_state;
// console output
TextEdit * m_multiedit;
PictureWidget *m_picture;
diff --cc src/viewarea.h
index 384768e,b5f526c..569c568
--- a/src/viewarea.h
+++ b/src/viewarea.h
@@@ -41,12 -39,11 +41,12 @@@ class VideoOutput
/*
* The area in which the video widget and controlpanel are laid out
*/
-class KMPLAYER_EXPORT ViewArea : public QWidget {
+class KMPLAYER_EXPORT ViewArea : public QWidget, public QAbstractNativeEventFilter \
{ + friend class VideoOutput;
Q_OBJECT
public:
- ViewArea (QWidget *parent, View *view, bool paint_bg);
- ~ViewArea ();
+ ViewArea(QWidget* parent, View *view, bool paint_bg) KDE_NO_CDTOR_EXPORT;
+ ~ViewArea() KDE_NO_CDTOR_EXPORT;
KDE_NO_EXPORT bool isFullScreen () const { return m_fullscreen; }
KDE_NO_EXPORT bool isMinimalMode () const { return m_minimal; }
KDE_NO_EXPORT KActionCollection * actionCollection () const { return \
m_collection; } @@@ -64,28 -61,29 +64,28 @@@
signals:
void fullScreenChanged ();
public slots:
- void fullScreen ();
- void accelActivated ();
- void scale (int);
+ void fullScreen() KDE_NO_EXPORT;
+ void accelActivated() KDE_NO_EXPORT;
+ void scale(int) KDE_NO_EXPORT;
protected:
- void showEvent (QShowEvent *);
- void keyPressEvent (QKeyEvent *);
- void mouseMoveEvent (QMouseEvent *);
- void mousePressEvent (QMouseEvent *);
- void mouseDoubleClickEvent (QMouseEvent *);
- void dragEnterEvent (QDragEnterEvent *);
- void dropEvent (QDropEvent *);
- void contextMenuEvent (QContextMenuEvent * e);
- void paintEvent (QPaintEvent *);
- void timerEvent (QTimerEvent * e);
- void closeEvent (QCloseEvent * e);
+ void showEvent(QShowEvent*) KDE_NO_EXPORT;
+ void keyPressEvent(QKeyEvent*) KDE_NO_EXPORT;
+ void mouseMoveEvent(QMouseEvent*) KDE_NO_EXPORT;
+ void mousePressEvent(QMouseEvent*) KDE_NO_EXPORT;
+ void mouseDoubleClickEvent(QMouseEvent*) KDE_NO_EXPORT;
+ void dragEnterEvent(QDragEnterEvent*) KDE_NO_EXPORT;
+ void dropEvent(QDropEvent*) KDE_NO_EXPORT;
+ void contextMenuEvent(QContextMenuEvent* e) KDE_NO_EXPORT;
+ void paintEvent(QPaintEvent*) KDE_NO_EXPORT;
+ void timerEvent(QTimerEvent* e) KDE_NO_EXPORT;
+ void closeEvent(QCloseEvent* e) KDE_NO_EXPORT;
- bool x11Event(XEvent* e) KDE_NO_EXPORT;
+ bool nativeEventFilter(const QByteArray& eventType, void * message, long \
*result); QPaintEngine *paintEngine () const;
private:
- void syncVisual ();
- void updateSurfaceBounds ();
- void stopTimers ();
+ void syncVisual() KDE_NO_EXPORT;
+ void updateSurfaceBounds() KDE_NO_EXPORT;
+ void stopTimers() KDE_NO_EXPORT;
- QByteArray m_dock_state;
ConnectionList m_updaters;
ViewerAreaPrivate *d;
View * m_view;
@@@ -124,27 -120,26 +124,27 @@@ public
virtual void setAspect (float a);
virtual float aspect () { return m_aspect; }
virtual void useIndirectWidget (bool);
- virtual void setMonitoring (Monitor m);
- virtual void map ();
- virtual void unmap ();
+ virtual void setMonitoring(Monitor m) KDE_NO_EXPORT;
+ virtual void map() KDE_NO_EXPORT;
+ virtual void unmap() KDE_NO_EXPORT;
KDE_NO_EXPORT long inputMask () const { return m_input_mask; }
- void setBackgroundColor (const QColor & c);
- void resetBackgroundColor ();
- void setCurrentBackgroundColor (const QColor & c);
- void sendKeyEvent (int key);
+ void setBackgroundColor(const QColor& c) KDE_NO_EXPORT;
+ void resetBackgroundColor() KDE_NO_EXPORT;
+ void setCurrentBackgroundColor(const QColor& c) KDE_NO_EXPORT;
KDE_NO_EXPORT View * view () const { return m_view; }
+
+ WindowId clientWinId() { return m_client_window; }
+ void discardClient() {}
- void embedded(WindowId handle);
++ void embedded(WindowId handle) KDE_NO_EXPORT;
public slots:
- void fullScreenChanged ();
- void sendConfigureEvent ();
- void embedded() KDE_NO_EXPORT;
+ void fullScreenChanged() KDE_NO_EXPORT;
protected:
- void resizeEvent (QResizeEvent *);
- void timerEvent (QTimerEvent *) KDE_NO_EXPORT;
- void dragEnterEvent (QDragEnterEvent *);
- void dropEvent (QDropEvent *);
- void contextMenuEvent (QContextMenuEvent * e);
+ void resizeEvent(QResizeEvent*) KDE_NO_EXPORT;
+ void timerEvent(QTimerEvent*) KDE_NO_EXPORT;
+ void dragEnterEvent(QDragEnterEvent*) KDE_NO_EXPORT;
+ void dropEvent(QDropEvent*) KDE_NO_EXPORT;
+ void contextMenuEvent(QContextMenuEvent* e) KDE_NO_EXPORT;
//virtual void windowChanged( WId w );
private:
WId m_plain_window;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic