Changeset 561 for trunk/src/3rdparty/phonon/ds9/volumeeffect.cpp

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:

• . (modified) (1 prop)
• src/3rdparty/phonon/ds9/volumeeffect.cpp (modified) (3 diffs)

trunk/src/3rdparty/phonon/ds9/volumeeffect.cpp

@@ -69 +69 @@
         {
             QVector<AM_MEDIA_TYPE> ret;
-
-            AM_MEDIA_TYPE mt;
-            mt.majortype = MEDIATYPE_Audio;
-            mt.subtype = MEDIASUBTYPE_PCM;
-            mt.bFixedSizeSamples = 1;
-            mt.bTemporalCompression = 0;
-            mt.pUnk = 0;
-            mt.lSampleSize = 1;
-            mt.cbFormat = 0;
-            mt.pbFormat = 0;
-            mt.formattype = GUID_NULL;
+            AM_MEDIA_TYPE mt = { MEDIATYPE_Audio, MEDIASUBTYPE_PCM, 1, 0, 1, GUID_NULL, 0, 0, 0};
             ret << mt;
             return ret;
@@ -87 +77 @@
         {
         public:
-            VolumeMemInputPin(QBaseFilter *parent, const QVector<AM_MEDIA_TYPE> &mt) : QMemInputPin(parent, mt, true /*transform*/)
+            VolumeMemInputPin(QBaseFilter *parent, const QVector<AM_MEDIA_TYPE> &mt, QPin *output) : QMemInputPin(parent, mt, true /*transform*/, output)
             {
             }
@@ -150 +140 @@
             //then creating the input
             mt << audioMediaType();
-            m_input = new VolumeMemInputPin(this, mt);
-            m_input->addOutput(m_output); //make the connection here
+            m_input = new VolumeMemInputPin(this, mt, m_output);
         }