summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2016-01-03 14:30:46 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2016-01-03 14:30:46 +0100
commit3702b79b402374042220dcdb3a1e0deb58100652 (patch)
tree766b5d3f73b26ffc5116fc5d23b2bf8a91a9fa8c /src
parentd8f9951070b01f8514f9f2773c3ab601cdd3e28c (diff)
Make build in formats list conditional, Bug #1530643
Diffstat (limited to 'src')
-rw-r--r--src/dlgpreflibrary.cpp13
-rw-r--r--src/dlgpreflibrarydlg.ui4
2 files changed, 15 insertions, 2 deletions
diff --git a/src/dlgpreflibrary.cpp b/src/dlgpreflibrary.cpp
index 005b4e09cb..6d44c1a0ab 100644
--- a/src/dlgpreflibrary.cpp
+++ b/src/dlgpreflibrary.cpp
@@ -76,6 +76,19 @@ DlgPrefLibrary::DlgPrefLibrary(QWidget * parent,
m_pLibrary, SLOT(slotSetTrackTableFont(QFont)));
connect(this, SIGNAL(setTrackTableRowHeight(int)),
m_pLibrary, SLOT(slotSetTrackTableRowHeight(int)));
+
+ // TODO(XXX) this string should be extracted from the soundsources
+ QString buildInFormatsStr = "Ogg Vorbis, FLAC, WAVe, AIFF";
+#if defined(__MAD__) || defined(__APPLE__)
+ buildInFormatsStr += ", MP3";
+#endif
+#ifdef __OPUS__
+ buildInFormatsStr += ", Opus";
+#endif
+#ifdef _MODPLUG_
+ buildInFormatsStr += ", ModPlug";
+#endif
+ buildInFormats->setText(buildInFormatsStr);
}
DlgPrefLibrary::~DlgPrefLibrary() {
diff --git a/src/dlgpreflibrarydlg.ui b/src/dlgpreflibrarydlg.ui
index ec86518fc2..2f05211a8d 100644
--- a/src/dlgpreflibrarydlg.ui
+++ b/src/dlgpreflibrarydlg.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <height>791</height>
<width>593</width>
+ <height>791</height>
</rect>
</property>
<property name="windowTitle">
@@ -117,7 +117,7 @@
</widget>
</item>
<item row="0" column="0">
- <widget class="QLabel" name="label_2">
+ <widget class="QLabel" name="buildInFormats">
<property name="text">
<string>MP3, Ogg Vorbis, FLAC, Opus, WAVe, AIFF</string>
</property>