Differential D21525 Diff 62677 src/audiowrapper_libvlc.cpp

Changeset View

Standalone View

View Options

src/audiowrapper_libvlc.cpp

Show First 20 Lines • Show All 227 Lines • ▼ Show 20 Line(s)225{
228 } 228​ }
229 229​
230 //auto realVolume = static_cast<qreal>(QAudio::convertVolume(volume / 100.0, QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale)); 230​ //auto realVolume = static_cast<qreal>(QAudio::convertVolume(volume / 100.0, QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale));
231 libvlc_audio_set_volume(d->mPlayer, qRound(volume)); 231​ libvlc_audio_set_volume(d->mPlayer, qRound(volume));
232} 232​}
233 233​
234void AudioWrapper::setSource(const QUrl &source) 234​void AudioWrapper::setSource(const QUrl &source)
235{ 235​{
236​ if(source.isLocalFile()){
astippichUnsubmitted
Done

code style
if (...) {

astippich: code style if (...) {
237​ qCDebug(orgKdeElisaPlayerVlc) << "AudioWrapper::setSource reading local resource";
236 d->mMedia = libvlc_media_new_path(d->mInstance, QDir::toNativeSeparators(source.toLocalFile()).toUtf8().constData()); 238​ d->mMedia = libvlc_media_new_path(d->mInstance, QDir::toNativeSeparators(source.toLocalFile()).toUtf8().constData());
239​ }else{
astippichUnsubmitted
Done

code style
} else {

astippich: code style } else {
240​ qCDebug(orgKdeElisaPlayerVlc) << "AudioWrapper::setSource reading remote resource";
241​ const char * charUrl = source.url().toUtf8().constData();
242​ d->mMedia = libvlc_media_new_location(d->mInstance, charUrl);
243​ }
244​
237 if (!d->mMedia) { 245​ if (!d->mMedia) {
238 qCDebug(orgKdeElisaPlayerVlc) << "AudioWrapper::setSource" 246​ qCDebug(orgKdeElisaPlayerVlc) << "AudioWrapper::setSource"
239 << "failed creating media" 247​ << "failed creating media"
240 << libvlc_errmsg() 248​ << libvlc_errmsg()
241 << QDir::toNativeSeparators(source.toLocalFile()).toUtf8().constData(); 249​ << QDir::toNativeSeparators(source.toLocalFile()).toUtf8().constData();
242 250​
243 d->mMedia = libvlc_media_new_path(d->mInstance, QDir::toNativeSeparators(source.toLocalFile()).toLatin1().constData()); 251​ d->mMedia = libvlc_media_new_path(d->mInstance, QDir::toNativeSeparators(source.toLocalFile()).toLatin1().constData());
244 if (!d->mMedia) { 252​ if (!d->mMedia) {
▲ Show 20 Lines • Show All 307 Lines • ▼ Show 20 Line(s)556{
552 560​
553 auto computedPosition = qRound64(newPosition * mMediaDuration); 561​ auto computedPosition = qRound64(newPosition * mMediaDuration);
554 562​
555 if (mPreviousPosition != computedPosition) { 563​ if (mPreviousPosition != computedPosition) {
556 mPreviousPosition = computedPosition; 564​ mPreviousPosition = computedPosition;
557 565​
558 mParent->playerPositionSignalChanges(mPreviousPosition); 566​ mParent->playerPositionSignalChanges(mPreviousPosition);
559 } 567​ }
568​
569​ if(this->mMedia){
astippichUnsubmitted
Done

code style
if (...) {

astippich: code style if (...) {
570​ QString title = QLatin1String(libvlc_media_get_meta(this->mMedia, libvlc_meta_Title));
571​ QString nowPlaying = QLatin1String(libvlc_media_get_meta(this->mMedia, libvlc_meta_NowPlaying));
572​
573​ Q_EMIT mParent->currentPlayingForRadiosChanged(title, nowPlaying);
574​ }
560} 575​}
561 576​
562void AudioWrapperPrivate::signalSeekableChange(bool isSeekable) 577​void AudioWrapperPrivate::signalSeekableChange(bool isSeekable)
563{ 578​{
564 if (mIsSeekable != isSeekable) { 579​ if (mIsSeekable != isSeekable) {
565 mIsSeekable = isSeekable; 580​ mIsSeekable = isSeekable;
566 581​
567 mParent->playerSeekableSignalChanges(isSeekable); 582​ mParent->playerSeekableSignalChanges(isSeekable);
Show All 14 Lines