Make chromaprint optional

CMakeLists.txt

@@ -109,8 +109,11 @@ pkg_check_modules(LIBXINE libxine)
 pkg_check_modules(LIBVLC libvlc)
 pkg_check_modules(PHONON phonon4qt5)
 pkg_check_modules(SQLITE REQUIRED sqlite3>=3.7)
-pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint)
 pkg_check_modules(LIBPULSE libpulse)
+pkg_check_modules(CHROMAPRINT libchromaprint)
+#if(CHROMAPRINT_FOUND)
+#  set(HAVE_CHROMAPRINT ON)
+#endif()
 pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92)
 pkg_check_modules(LIBMTP libmtp>=1.0)
 pkg_check_modules(IMOBILEDEVICE libimobiledevice-1.0)
@@ -184,9 +187,6 @@ if(LASTFM5_INCLUDE_DIRS AND LASTFM51_INCLUDE_DIRS)
   set(HAVE_LIBLASTFM1 ON)
 endif()
 
-# CHECK INCLUDES
-CHECK_INCLUDE_FILES(chromaprint.h CHROMAPRINT_H)
-
 # Use system sha2 if it's available
 find_path(SHA2_INCLUDE_DIRS sha2.h)
 find_library(SHA2_LIBRARIES sha2)
@@ -286,34 +286,22 @@ optional_component(PHONON OFF "Engine: Phonon backend"
   DEPENDS "phonon4qt5" PHONON_FOUND
 )
 
-optional_component(AUDIOCD ON "Devices: Audio CD support"
+optional_component(LIBPULSE ON "Pulse audio integration"
-  DEPENDS "libcdio" CDIO_FOUND
+  DEPENDS "libpulse" LIBPULSE_FOUND
-)
-
-optional_component(LIBGPOD ON "Devices: iPod classic support"
-  DEPENDS "libgpod" LIBGPOD_FOUND
-)
-
-optional_component(GIO ON "Devices: GIO device backend"
-  DEPENDS "libgio" GIO_FOUND
-  DEPENDS "Unix or Windows" "NOT APPLE"
-)
-
-optional_component(IMOBILEDEVICE ON "Devices: iPod Touch, iPhone, iPad support"
-  DEPENDS "libimobiledevice" IMOBILEDEVICE_FOUND
-  DEPENDS "libplist" PLIST_FOUND
-  DEPENDS "libusbmuxd" USBMUXD_FOUND
-  DEPENDS "iPod classic support" HAVE_LIBGPOD
-)
-
-optional_component(LIBMTP ON "Devices: MTP support"
-  DEPENDS "libmtp" LIBMTP_FOUND
 )
 
 optional_component(LIBLASTFM ON "Last.fm album cover provider"
   DEPENDS "liblastfm" LASTFM5_LIBRARIES LASTFM5_INCLUDE_DIRS
 )
 
+optional_component(CHROMAPRINT ON "Chromaprint support / Tag fetching from Musicbrainz"
+  DEPENDS "chromaprint" CHROMAPRINT_FOUND
+)
+
+optional_component(AUDIOCD ON "Devices: Audio CD support"
+  DEPENDS "libcdio" CDIO_FOUND
+)
+
 optional_component(DEVICEKIT ON "Devices: DeviceKit backend"
   DEPENDS "D-Bus support" DBUS_FOUND
 )
@@ -322,8 +310,24 @@ optional_component(UDISKS2 ON "Devices: UDisks2 backend"
   DEPENDS "D-Bus support" DBUS_FOUND
 )
 
-optional_component(LIBPULSE ON "Pulse audio integration"
+optional_component(GIO ON "Devices: GIO device backend"
-  DEPENDS "libpulse" LIBPULSE_FOUND
+  DEPENDS "libgio" GIO_FOUND
+  DEPENDS "Unix or Windows" "NOT APPLE"
+)
+
+optional_component(LIBGPOD ON "Devices: iPod classic support"
+  DEPENDS "libgpod" LIBGPOD_FOUND
+)
+
+optional_component(LIBMTP ON "Devices: MTP support"
+  DEPENDS "libmtp" LIBMTP_FOUND
+)
+
+optional_component(IMOBILEDEVICE ON "Devices: iPod Touch, iPhone, iPad support"
+  DEPENDS "libimobiledevice" IMOBILEDEVICE_FOUND
+  DEPENDS "libplist" PLIST_FOUND
+  DEPENDS "libusbmuxd" USBMUXD_FOUND
+  DEPENDS "iPod classic support" LIBGPOD_FOUND
 )
 
 optional_component(SPARKLE ON "Sparkle integration"

cmake/Version.cmake

@@ -26,7 +26,7 @@ endif(STRAWBERRY_VERSION_PRERELEASE)
 if(INCLUDE_GIT_REVISION AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
 
   find_program(GIT_EXECUTABLE git)
-  if(GIT_EXECUTABLE-NOTFOUND)
+  if(NOT GIT_EXECUTABLE OR GIT_EXECUTABLE-NOTFOUND)
     message(FATAL_ERROR "Missing GIT executable." )
   endif()
 

src/CMakeLists.txt

@@ -724,8 +724,6 @@ SOURCES
   settings/transcodersettingspage.cpp
   dialogs/organisedialog.cpp
   dialogs/organiseerrordialog.cpp
-  musicbrainz/chromaprinter.cpp
-  musicbrainz/tagfetcher.cpp
   transcoder/transcoder.cpp
   transcoder/transcodedialog.cpp
   transcoder/transcoderoptionsaac.cpp
@@ -741,7 +739,6 @@ HEADERS
   settings/transcodersettingspage.h
   dialogs/organisedialog.h
   dialogs/organiseerrordialog.h
-  musicbrainz/tagfetcher.h
   transcoder/transcoder.h
   transcoder/transcodedialog.h
   transcoder/transcoderoptionsdialog.h
@@ -764,6 +761,13 @@ UI
 
 # CDIO backend and device
 if(HAVE_GSTREAMER)
+optional_source(HAVE_CHROMAPRINT
+SOURCES
+  musicbrainz/chromaprinter.cpp
+  musicbrainz/tagfetcher.cpp
+HEADERS
+  musicbrainz/tagfetcher.h
+)
 optional_source(HAVE_AUDIOCD
   SOURCES
     device/cddadevice.cpp

src/config.h.in

@@ -36,6 +36,7 @@
 #cmakedefine HAVE_LIBPULSE
 #cmakedefine HAVE_QCA
 #cmakedefine HAVE_SPARKLE
+#cmakedefine HAVE_CHROMAPRINT
 #cmakedefine IMOBILEDEVICE_USES_UDIDS
 #cmakedefine USE_INSTALL_PREFIX
 #cmakedefine USE_SYSTEM_SHA2

src/core/mainwindow.cpp

@@ -116,7 +116,6 @@
 #include "analyzer/analyzercontainer.h"
 #include "equalizer/equalizer.h"
 #include "globalshortcuts/globalshortcuts.h"
-#include "musicbrainz/tagfetcher.h"
 #include "covermanager/albumcovermanager.h"
 #include "device/devicemanager.h"
 #include "device/devicestatefiltermodel.h"
@@ -127,6 +126,10 @@
 #include "settings/playlistsettingspage.h"
 #include "settings/settingsdialog.h"
 
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
+#  include "musicbrainz/tagfetcher.h"
+#endif
+
 #ifdef Q_OS_MACOS
 #  include "core/macsystemtrayicon.h"
 #endif
@@ -341,7 +344,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
   connect(ui_->action_renumber_tracks, SIGNAL(triggered()), SLOT(RenumberTracks()));
   connect(ui_->action_selection_set_value, SIGNAL(triggered()), SLOT(SelectionSetValue()));
   connect(ui_->action_edit_value, SIGNAL(triggered()), SLOT(EditValue()));
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
   connect(ui_->action_auto_complete_tags, SIGNAL(triggered()), SLOT(AutoCompleteTags()));
 #endif
   connect(ui_->action_settings, SIGNAL(triggered()), SLOT(OpenSettingsDialog()));
@@ -1239,8 +1242,13 @@ void MainWindow::PlaylistRightClick(const QPoint &global_pos, const QModelIndex
   // this is available when we have one or many files and at least one of those is not CUE related
   ui_->action_edit_track->setEnabled(editable);
   ui_->action_edit_track->setVisible(editable);
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
   ui_->action_auto_complete_tags->setEnabled(editable);
   ui_->action_auto_complete_tags->setVisible(editable);
+#else
+  ui_->action_auto_complete_tags->setEnabled(false);
+  ui_->action_auto_complete_tags->setVisible(false);
+#endif
   // the rest of the read / write actions work only when there are no CUEs involved
   if (cue_selected) editable = 0;
 
@@ -2155,7 +2163,7 @@ void MainWindow::Exit() {
 
 }
 
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
 void MainWindow::AutoCompleteTags() {
 
   // Create the tag fetching stuff if it hasn't been already

src/core/mainwindow.h

@@ -75,7 +75,9 @@ class QueueManager;
 class Song;
 class StatusView;
 class SystemTrayIcon;
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
 class TagFetcher;
+#endif
 class TrackSelectionDialog;
 #ifdef HAVE_GSTREAMER
 class TranscodeDialog;
@@ -166,7 +168,7 @@ signals:
   void RenumberTracks();
   void SelectionSetValue();
   void EditValue();
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
   void AutoCompleteTags();
   void AutoCompleteTagsAccepted();
 #endif
@@ -303,11 +305,11 @@ signals:
 #endif
   Lazy<QueueManager> queue_manager_;
 
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
   std::unique_ptr<TagFetcher> tag_fetcher_;
 #endif
   std::unique_ptr<TrackSelectionDialog> track_selection_dialog_;
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
   PlaylistItemList autocomplete_tag_items_;
 #endif
 

src/device/cddasongloader.cpp

@@ -164,6 +164,7 @@ void CddaSongLoader::LoadSongs() {
   }
   emit SongsDurationLoaded(songs);
 
+#ifdef HAVE_CHROMAPRINT
   // Handle TAG message: generate MusicBrainz DiscId
   if (msg_tag) {
     GstTagList *tags = nullptr;
@@ -181,6 +182,7 @@ void CddaSongLoader::LoadSongs() {
       gst_tag_list_free(tags);
     }
   }
+#endif
 
   gst_element_set_state(pipeline, GST_STATE_NULL);
   // This will also cause cdda_ to be unref'd.
@@ -188,6 +190,7 @@ void CddaSongLoader::LoadSongs() {
 
 }
 
+#ifdef HAVE_CHROMAPRINT
 void CddaSongLoader::AudioCDTagsLoaded(const QString &artist, const QString &album, const MusicBrainzClient::ResultList &results) {
 
   MusicBrainzClient *musicbrainz_client = qobject_cast<MusicBrainzClient*>(sender());
@@ -213,6 +216,7 @@ void CddaSongLoader::AudioCDTagsLoaded(const QString &artist, const QString &alb
   emit SongsMetadataLoaded(songs);
 
 }
+#endif
 
 bool CddaSongLoader::HasChanged() {
 

src/device/cddasongloader.h

@@ -37,7 +37,9 @@
 #include <gst/audio/gstaudiocdsrc.h>
 
 #include "core/song.h"
-#include "musicbrainz/musicbrainzclient.h"
+#ifdef HAVE_CHROMAPRINT
+#  include "musicbrainz/musicbrainzclient.h"
+#endif
 
 // This class provides a (hopefully) nice, high level interface to get CD information and load tracks
 class CddaSongLoader : public QObject {
@@ -60,7 +62,9 @@ class CddaSongLoader : public QObject {
   void SongsMetadataLoaded(const SongList &songs);
 
  private slots:
+#ifdef HAVE_CHROMAPRINT
   void AudioCDTagsLoaded(const QString &artist, const QString &album, const MusicBrainzClient::ResultList &results);
+#endif
 
  private:
   QUrl GetUrlFromTrack(int track_number) const;

src/dialogs/edittagdialog.cpp

@@ -76,7 +76,9 @@
 #include "collection/collectionbackend.h"
 #include "playlist/playlist.h"
 #include "playlist/playlistdelegates.h"
-#include "musicbrainz/tagfetcher.h"
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
+#  include "musicbrainz/tagfetcher.h"
+#endif
 #include "covermanager/albumcoverchoicecontroller.h"
 #include "covermanager/albumcoverloader.h"
 #include "covermanager/coverproviders.h"
@@ -94,7 +96,7 @@ EditTagDialog::EditTagDialog(Application *app, QWidget *parent)
       album_cover_choice_controller_(new AlbumCoverChoiceController(this)),
       loading_(false),
       ignore_edits_(false),
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
       tag_fetcher_(new TagFetcher(this)),
 #endif
       cover_art_id_(0),
@@ -108,7 +110,7 @@ EditTagDialog::EditTagDialog(Application *app, QWidget *parent)
 
   connect(app_->album_cover_loader(), SIGNAL(ImageLoaded(quint64,QImage,QImage)), SLOT(ArtLoaded(quint64,QImage,QImage)));
 
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
   connect(tag_fetcher_, SIGNAL(ResultAvailable(Song, SongList)), results_dialog_, SLOT(FetchTagFinished(Song, SongList)), Qt::QueuedConnection);
   connect(tag_fetcher_, SIGNAL(Progress(Song,QString)), results_dialog_, SLOT(FetchTagProgress(Song,QString)));
   connect(results_dialog_, SIGNAL(SongChosen(Song, Song)), SLOT(FetchTagSongChosen(Song, Song)));
@@ -122,6 +124,11 @@ EditTagDialog::EditTagDialog(Application *app, QWidget *parent)
   ui_->loading_label->hide();
 
   ui_->fetch_tag->setIcon(QPixmap::fromImage(QImage(":/pictures/musicbrainz.png")));
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
+  ui_->fetch_tag->setEnabled(true);
+#else
+  ui_->fetch_tag->setEnabled(false);
+#endif
 
   // An editable field is one that has a label as a buddy.  The label is
   // important because it gets turned bold when the field is changed.
@@ -168,7 +175,9 @@ EditTagDialog::EditTagDialog(Application *app, QWidget *parent)
   connect(ui_->button_box, SIGNAL(clicked(QAbstractButton*)), SLOT(ButtonClicked(QAbstractButton*)));
   //connect(ui_->rating, SIGNAL(RatingChanged(float)), SLOT(SongRated(float)));
   connect(ui_->playcount_reset, SIGNAL(clicked()), SLOT(ResetPlayCounts()));
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
   connect(ui_->fetch_tag, SIGNAL(clicked()), SLOT(FetchTag()));
+#endif
 
   // Set up the album cover menu
   cover_menu_ = new QMenu(this);
@@ -237,7 +246,9 @@ bool EditTagDialog::SetLoading(const QString &message) {
   ui_->button_box->setEnabled(!loading);
   ui_->tab_widget->setEnabled(!loading);
   ui_->song_list->setEnabled(!loading);
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
   ui_->fetch_tag->setEnabled(!loading);
+#endif
   ui_->loading_label->setVisible(loading);
   ui_->loading_label->set_text(message);
   return true;
@@ -826,7 +837,7 @@ void EditTagDialog::ResetPlayCounts() {
   UpdateStatisticsTab(*song);
 }
 
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
 void EditTagDialog::FetchTag() {
   
   const QModelIndexList sel = ui_->song_list->selectionModel()->selectedIndexes();

src/dialogs/edittagdialog.h

@@ -50,10 +50,12 @@ class QShowEvent;
 class QHideEvent;
 
 class Application;
-class TagFetcher;
 class AlbumCoverChoiceController;
 class TrackSelectionDialog;
 class Ui_EditTagDialog;
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
+class TagFetcher;
+#endif
 
 class EditTagDialog : public QDialog {
   Q_OBJECT
@@ -106,7 +108,7 @@ protected:
   void ResetField();
   void ButtonClicked(QAbstractButton *button);
   void ResetPlayCounts();
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
   void FetchTag();
   void FetchTagSongChosen(const Song &original_song, const Song &new_metadata);
 #endif
@@ -170,7 +172,7 @@ private:
 
   bool ignore_edits_;
 
-#ifdef HAVE_GSTREAMER
+#if defined(HAVE_GSTREAMER) && defined(HAVE_CHROMAPRINT)
   TagFetcher *tag_fetcher_;
 #endif