Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/3rdparty/phonon/qt7/quicktimemetadata.h

    r2 r561  
    3939    {
    4040        public:
    41             QuickTimeMetaData();
    42             virtual ~QuickTimeMetaData();
    43 
    44             void setVideo(QuickTimeVideoPlayer *videoPlayer);
     41            QuickTimeMetaData(QuickTimeVideoPlayer *videoPlayer);
     42            void update();
    4543            QMultiMap<QString, QString> metaData();
    4644
     
    5048            QuickTimeVideoPlayer *m_videoPlayer;
    5149            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.