Changeset 846 for trunk/src/3rdparty/phonon/gstreamer/mediaobject.h
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/3rdparty/phonon/gstreamer/mediaobject.h
r2 r846 56 56 { 57 57 friend class Stream; 58 friend class AudioDataOutput; 58 59 Q_OBJECT 59 60 Q_INTERFACES(Phonon::MediaObjectInterface … … 145 146 void handleEndOfStream(); 146 147 void addMissingCodecName(const QString &codec) { m_missingCodecs.append(codec); } 147 void invalidateGraph() { 148 m_resetNeeded = true; 149 if (m_state == Phonon::PlayingState || m_state == Phonon::PausedState) { 150 changeState(Phonon::StoppedState); 151 } 152 } 148 void invalidateGraph(); 149 153 150 static void cb_newpad (GstElement *decodebin, GstPad *pad, gboolean last, gpointer data); 154 151 static void cb_pad_added (GstElement *decodebin, GstPad *pad, gpointer data); … … 237 234 int _iface_currentTitle() const; 238 235 void _iface_setCurrentTitle(int title); 236 void setTrack(int title); 239 237 240 238 bool m_resumeState; … … 251 249 qint32 m_prefinishMark; 252 250 qint32 m_transitionTime; 251 bool m_isStream; 253 252 254 253 qint64 m_posAtSeek; … … 286 285 int m_availableTitles; 287 286 int m_currentTitle; 287 int m_pendingTitle; 288 288 }; 289 289 }
Note:
See TracChangeset
for help on using the changeset viewer.