Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/3rdparty/phonon/gstreamer/mediaobject.h

    r2 r846  
    5656{
    5757    friend class Stream;
     58    friend class AudioDataOutput;
    5859    Q_OBJECT
    5960    Q_INTERFACES(Phonon::MediaObjectInterface
     
    145146    void handleEndOfStream();
    146147    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
    153150    static void cb_newpad (GstElement *decodebin, GstPad *pad, gboolean last, gpointer data);
    154151    static void cb_pad_added (GstElement *decodebin, GstPad *pad, gpointer data);
     
    237234    int _iface_currentTitle() const;
    238235    void _iface_setCurrentTitle(int title);
     236    void setTrack(int title);
    239237
    240238    bool m_resumeState;
     
    251249    qint32 m_prefinishMark;
    252250    qint32 m_transitionTime;
     251        bool m_isStream;
    253252
    254253    qint64 m_posAtSeek;
     
    286285    int m_availableTitles;
    287286    int m_currentTitle;
     287    int m_pendingTitle;
    288288};
    289289}
Note: See TracChangeset for help on using the changeset viewer.