Merge pull request #1052 from kde-freebsd/master

Include ctime for time_t and fix tr() call.
CDrummond · Aug 12, 2017 · acc4cae · acc4cae
2 parents 9f5e007 + c3fe888
commit acc4cae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/devices/cddbinterface.cpp b/devices/cddbinterface.cpp
@@ -158,7 +158,7 @@ void CddbInterface::readDisc()
                     cddb_track_t *track = cddb_track_new();
                     if (track) {
                         cddb_track_set_frame_offset(track, te.entry.addr.lba + SECONDS_TO_FRAMES(2));
-                        cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : tr("Track %1", i).toUtf8().constData());
+                        cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : tr("Track %1").arg(i).toUtf8().constData());
                         cddb_track_set_artist(track, unknown.constData());
                         cddb_disc_add_track(disc, track);
                     }

diff --git a/mpd-interface/httpstream.cpp b/mpd-interface/httpstream.cpp
@@ -25,7 +25,9 @@
 #include "mpdconnection.h"
 #include "mpdstatus.h"
 #include "gui/settings.h"
+#ifndef LIBVLC_FOUND
 #include <QtMultimedia/QMediaPlayer>
+#endif
 #include <QTimer>
 
 static const int constPlayerCheckPeriod=250;

diff --git a/mpd-interface/mpdstats.h b/mpd-interface/mpdstats.h
@@ -27,6 +27,7 @@
 #ifndef MPD_STATS_H
 #define MPD_STATS_H
 
+#include <ctime>
 #include <QDateTime>
 #include <QObject>