mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-03 12:47:45 +02:00
* This wasn't supposed to end up in phonon branch.
This commit is contained in:
@@ -180,13 +180,6 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
|
|||||||
{
|
{
|
||||||
setCurrentTrack( result );
|
setCurrentTrack( result );
|
||||||
io = Servent::instance()->getIODeviceForUrl( m_currentTrack );
|
io = Servent::instance()->getIODeviceForUrl( m_currentTrack );
|
||||||
if ( m_currentTrack->url().startsWith( "http://" ) )
|
|
||||||
{
|
|
||||||
m_readReady = false;
|
|
||||||
connect( io.data(), SIGNAL( downloadProgress( qint64, qint64 ) ), SLOT( onDownloadProgress( qint64, qint64 ) ) );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
m_readReady = true;
|
|
||||||
|
|
||||||
if ( !io || io.isNull() )
|
if ( !io || io.isNull() )
|
||||||
{
|
{
|
||||||
@@ -203,8 +196,6 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
|
|||||||
if ( !m_input.isNull() )
|
if ( !m_input.isNull() )
|
||||||
{
|
{
|
||||||
m_expectStop = true;
|
m_expectStop = true;
|
||||||
m_input->close();
|
|
||||||
m_input.clear();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
m_input = io;
|
m_input = io;
|
||||||
|
@@ -116,7 +116,6 @@ private:
|
|||||||
Phonon::MediaObject* m_mediaObject;
|
Phonon::MediaObject* m_mediaObject;
|
||||||
Phonon::AudioOutput* m_audioOutput;
|
Phonon::AudioOutput* m_audioOutput;
|
||||||
|
|
||||||
bool m_readReady;
|
|
||||||
unsigned int m_timeElapsed;
|
unsigned int m_timeElapsed;
|
||||||
bool m_expectStop;
|
bool m_expectStop;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user