Commit 96995095 authored by Michael Pyne's avatar Michael Pyne

Crossing my fingers here but this refactor of the playback code seems to be...

Crossing my fingers here but this refactor of the playback code seems to be working well in both phonon-xine
and phonon-gst.  Crossfade only occurs when a song ends now while the change is abrupt when manually switching
tracks because I'm evil (or awesome depending on how you see it).

svn path=/trunk/KDE/kdemultimedia/juk/; revision=916339
parent d1f568d3
This diff is collapsed.
......@@ -109,6 +109,7 @@ signals:
private:
void setup();
void crossfadeToFile(const FileHandle &newFile);
void stopCrossfade();
private slots:
void slotNeedNextUrl();
......@@ -116,7 +117,9 @@ private slots:
void slotLength(qint64);
void slotTick(qint64);
void slotStateChanged(Phonon::State, Phonon::State);
void slotKillSender(); // Used to auto-delete media objects at EOF
void slotUpdateSliders();
/// Updates the GUI to reflect stopped playback if we're stopped at this point.
void slotUpdateGuiIfStopped();
private:
FileHandle m_file;
......@@ -129,10 +132,11 @@ private:
static const int m_pollInterval = 800;
Phonon::AudioOutput *m_output;
Phonon::Path m_audioPath;
Phonon::MediaObject *m_media;
Phonon::VolumeFaderEffect *m_fader;
int m_curOutputPath; ///< Either 0 or 1 depending on which output path is in use.
Phonon::AudioOutput *m_output[2];
Phonon::Path m_audioPath[2];
Phonon::MediaObject *m_media[2];
Phonon::VolumeFaderEffect *m_fader[2];
};
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment