Commit 42b26d85 authored by Matthias Kretz's avatar Matthias Kretz

libphononcore -> libphonon

no ui subdir anymore
length -> totalTimeChanged

svn path=/branches/work/phonon-solid-sprint/kdemultimedia/juk/; revision=659728
parent ed7abcca
......@@ -100,7 +100,7 @@ kde4_add_executable(juk ${juk_SRCS})
# Add gstreamer here too...
target_link_libraries(juk m ${KDE4_KIO_LIBS} ${KDE4_KHTML_LIBS} ${TAGLIB_LIBRARIES}
${KDE4_PHONONUI_LIBS})
${KDE4_PHONON_LIBS})
if(TUNEPIMP_FOUND)
target_link_libraries(juk ${TUNEPIMP_LIBRARIES})
endif(TUNEPIMP_FOUND)
......
......@@ -267,7 +267,7 @@ void PlayerManager::play(const FileHandle &file)
m_media->setTickInterval(200);
if(m_sliderAction->trackPositionSlider())
m_sliderAction->trackPositionSlider()->setMediaObject(m_media);
connect(m_media, SIGNAL(length(qint64)), SLOT(slotLength(qint64)));
connect(m_media, SIGNAL(totalTimeChanged(qint64)), SLOT(slotLength(qint64)));
connect(m_media, SIGNAL(tick(qint64)), SLOT(slotTick(qint64)));
connect(m_media, SIGNAL(finished()), SLOT(slotFinished()));
m_media->setCurrentSource(KUrl::fromPath(m_file.absFilePath()));
......@@ -473,7 +473,7 @@ void PlayerManager::slotNeedNextUrl()
m_file = nextFile;
m_media->enqueue(KUrl::fromPath(m_file.absFilePath()));
}
// at this point the new totalTime is not known, but the length signal will tell us
// at this point the new totalTime is not known, but the totalTimeChanged signal will tell us
}
void PlayerManager::slotFinished()
......@@ -585,7 +585,7 @@ void PlayerManager::setup()
m_sliderAction->volumeSlider()->setAudioOutput(m_output);
}
connect(m_media, SIGNAL(length(qint64)), SLOT(slotLength(qint64)));
connect(m_media, SIGNAL(totalTimeChanged(qint64)), SLOT(slotLength(qint64)));
connect(m_media, SIGNAL(tick(qint64)), SLOT(slotTick(qint64)));
connect(m_media, SIGNAL(finished()), SLOT(slotFinished()));
}
......
......@@ -22,8 +22,8 @@
#include <QFocusEvent>
#include <QBoxLayout>
#include <ktoolbar.h>
#include <phonon/ui/volumeslider.h>
#include <phonon/ui/seekslider.h>
#include <phonon/volumeslider.h>
#include <phonon/seekslider.h>
class KActionCollection;
class QBoxLayout;
......
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