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/qt7/quicktimemetadata.h

    r561 r846  
    3939    {
    4040        public:
    41             QuickTimeMetaData(QuickTimeVideoPlayer *videoPlayer);
    42             void update();
     41            QuickTimeMetaData();
     42            virtual ~QuickTimeMetaData();
     43
     44            void setVideo(QuickTimeVideoPlayer *videoPlayer);
    4345            QMultiMap<QString, QString> metaData();
    4446
     
    4850            QuickTimeVideoPlayer *m_videoPlayer;
    4951            void readMetaData();
    50             void guessMetaDataForCD();
    51             void readMetaDataFromMovie();
    5252
    5353#ifdef QUICKTIME_C_API_AVAILABLE
Note: See TracChangeset for help on using the changeset viewer.