Merge branch '2.3' of https://github.com/mixxxdj/mixxx

Holzhaus · Mar 16, 2021 · 69c46a9 · 69c46a9
2 parents 6ce25ab + bca86b1
commit 69c46a9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2462,7 +2462,7 @@ if(BROADCAST)
   elseif(Shoutidjc_FOUND AND Shoutidjc_VERSION VERSION_LESS 2.4.6)
       message(STATUS "Installed libshout version: ${Shout_VERSION} is suffering from bug lp1913579")
   endif()
-  if(NOT Shsoutidjc_FOUND OR Shoutidjc_VERSION VERSION_LESS 2.4.6)
+  if(NOT Shoutidjc_FOUND OR Shoutidjc_VERSION VERSION_LESS 2.4.6)
     # Fall back to internal libraray in the lib tree
     message(STATUS "Using internal libshout-idjc")
     add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/libshout-idjc")

diff --git a/lib/libshout-idjc/CMakeLists.txt b/lib/libshout-idjc/CMakeLists.txt
@@ -75,12 +75,10 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Ogg::ogg)
 find_package(Vorbis REQUIRED)
 target_link_libraries(${PROJECT_NAME} PUBLIC Vorbis::vorbis Vorbis::vorbisenc)
 
-# Optional system dependencies
-find_package(OpenSSL)
-if(TARGET OpenSSL::SSL)
-    target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_OPENSSL)
-    target_link_libraries(${PROJECT_NAME} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
-endif()
+# OpenSSL
+find_package(OpenSSL REQUIRED)
+target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_OPENSSL)
+target_link_libraries(${PROJECT_NAME} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
 
 option(SPEEX "Speex support" OFF)
 if(SPEEX)

diff --git a/src/library/browse/browsethread.cpp b/src/library/browse/browsethread.cpp
@@ -211,7 +211,7 @@ void BrowseThread::populateModel() {
             QString duration = pTrack->getDurationText(mixxx::Duration::Precision::SECONDS);
             item = new QStandardItem(duration);
             item->setToolTip(item->text());
-            item->setData(item->text(), Qt::UserRole);
+            item->setData(pTrack->getDuration(), Qt::UserRole);
             row_data.insert(COLUMN_DURATION, item);
 
             item = new QStandardItem(pTrack->getBpmText());

diff --git a/src/soundio/soundmanager.cpp b/src/soundio/soundmanager.cpp
@@ -623,20 +623,17 @@ void SoundManager::readProcess() const {
 }
 
 void SoundManager::registerOutput(const AudioOutput& output, AudioSource* src) {
-    if (m_registeredSources.contains(output)) {
-        qDebug() << "WARNING: AudioOutput already registered!";
+    VERIFY_OR_DEBUG_ASSERT(!m_registeredSources.contains(output)) {
+        return;
     }
     m_registeredSources.insert(output, src);
     emit outputRegistered(output, src);
 }
 
 void SoundManager::registerInput(const AudioInput& input, AudioDestination* dest) {
-    if (m_registeredDestinations.contains(input)) {
-        // note that this can be totally ok if we just want a certain
-        // AudioInput to be going to a different AudioDest -bkgood
-        qDebug() << "WARNING: AudioInput already registered!";
-    }
-
+    // Vinyl control inputs are registered twice, once for timecode and once for
+    // passthrough, each with different outputs. So unlike outputs, do not assert
+    // that the input has not been registered yet.
     m_registeredDestinations.insert(input, dest);
 
     emit inputRegistered(input, dest);

diff --git a/tools/debian_buildenv.sh b/tools/debian_buildenv.sh
@@ -74,6 +74,7 @@ case "$COMMAND" in
             libsndfile1-dev \
             libsoundtouch-dev \
             libsqlite3-dev \
+            libssl-dev \
             libtag1-dev \
             libupower-glib-dev \
             libusb-1.0-0-dev \