Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.4' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
daschuer committed Feb 16, 2024
2 parents 031dfde + ca8720f commit 168c921
Show file tree
Hide file tree
Showing 73 changed files with 358 additions and 204 deletions.
41 changes: 32 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## [2.5.0](https://github.com/mixxxdj/mixxx/issues?q=milestone%3A2.5.0) (Unreleased)

## [2.4.0](https://launchpad.net/mixxx/+milestone/2.4.0) (Unreleased)
## [2.4.0](https://launchpad.net/mixxx/+milestone/2.4.0) (2024-02-16)

### Music Library: Tracks Table & Track Menu

Expand Down Expand Up @@ -33,7 +33,9 @@
[#10537](https://github.com/mixxxdj/mixxx/issues/10537)
[#11239](https://github.com/mixxxdj/mixxx/pull/11239)
[#4577](https://github.com/mixxxdj/mixxx/pull/4577)
[#1947992](https://github.com/mixxxdj/mixxx/issues/10577)
[#10577](https://github.com/mixxxdj/mixxx/issues/10577)
[#11171](https://github.com/mixxxdj/mixxx/pull/11171)
[#10761](https://github.com/mixxxdj/mixxx/issues/10761)
* Fix Recording table refresh issues [#4648](https://github.com/mixxxdj/mixxx/pull/4648)
* Show time in addition to the date in the timestamp column
[#4900](https://github.com/mixxxdj/mixxx/pull/4900)
Expand All @@ -53,7 +55,7 @@
[#11873](https://github.com/mixxxdj/mixxx/pull/11873)
[#11872](https://github.com/mixxxdj/mixxx/issues/11872)
* Add support for overriding analyzis settings about variable/constant BPM on a per-track basis [#10931](https://github.com/mixxxdj/mixxx/pull/10931)
* Add menu for looking up track metadata at Discogs, Soundcoud and LastFM [#4772](https://github.com/mixxxdj/mixxx/pull/4772) [#4836](https://github.com/mixxxdj/mixxx/pull/4836)
* Add menu for looking up track metadata at Discogs, SoundCloud and LastFM [#4772](https://github.com/mixxxdj/mixxx/pull/4772) [#4836](https://github.com/mixxxdj/mixxx/pull/4836)
* Add "Delete Track Files" action, does "Move to Trash" with Qt >= 5.15
[#4560](https://github.com/mixxxdj/mixxx/pull/4560)
[#4831](https://github.com/mixxxdj/mixxx/pull/4831)
Expand All @@ -71,10 +73,12 @@
[#10748](https://github.com/mixxxdj/mixxx/issues/10748)
[#12392](https://github.com/mixxxdj/mixxx/pull/12392)
[#12521](https://github.com/mixxxdj/mixxx/pull/12521)
* Show 'Update ReplayGain' only in decks' menus [#4719](https://github.com/mixxxdj/mixxx/pull/4719)
* Fix showing wrong Remove hotkey [#11171](https://github.com/mixxxdj/mixxx/pull/11171) [#10761](https://github.com/mixxxdj/mixxx/issues/10761)
* Add 'Update ReplayGain' decks' to track menus [#4031](https://github.com/mixxxdj/mixxx/pull/4031) [#4719](https://github.com/mixxxdj/mixxx/pull/4719)
* Restore "Remove from playlist" in History [#11591](https://github.com/mixxxdj/mixxx/pull/11591) [#10974](https://github.com/mixxxdj/mixxx/issues/10974)
* Enable Lock BPM action if any selected track BPM is unlocked [#12385](https://github.com/mixxxdj/mixxx/pull/12385)
* Order BPM action by factor, show peview (for single track) [#12701](https://github.com/mixxxdj/mixxx/pull/12701) [#10128](https://github.com/mixxxdj/mixxx/issues/10128)
* Provide the same features in all deck track menus [#12214](https://github.com/mixxxdj/mixxx/pull/12214)
* Track table header: Keep menu open after toggling a checkbox [#12218](https://github.com/mixxxdj/mixxx/pull/12218)

### Music Library: Sidebar & Searchbar

Expand Down Expand Up @@ -327,7 +331,7 @@
* Allow to cancel active loops via beatloop_activate [#4328](https://github.com/mixxxdj/mixxx/pull/4328) [#9950](https://github.com/mixxxdj/mixxx/issues/9950)
* Slip Mode: Preserve active (regular) loop when leaving Slip Mode [#11435](https://github.com/mixxxdj/mixxx/pull/11435) [#6993](https://github.com/mixxxdj/mixxx/issues/6993)
* Fix possible segfault when ejecting track [#4362](https://github.com/mixxxdj/mixxx/pull/4362) [#10497](https://github.com/mixxxdj/mixxx/issues/10497)
* Fix: possible cash when ejecting track from a controller [#11884](https://github.com/mixxxdj/mixxx/pull/11884) [#11819](https://github.com/mixxxdj/mixxx/issues/11819)
* Fix possible crash when ejecting track from a controller [#11884](https://github.com/mixxxdj/mixxx/pull/11884) [#11819](https://github.com/mixxxdj/mixxx/issues/11819)
* Fix an assertion when loop is before track start [#4383](https://github.com/mixxxdj/mixxx/pull/4383) [#10556](https://github.com/mixxxdj/mixxx/issues/10556)
* Fix and improve snapping to beats in various situations [#4366](https://github.com/mixxxdj/mixxx/pull/4366) [#10541](https://github.com/mixxxdj/mixxx/issues/10541)
* Don't wipe inapplicable sound config immediately [#4544](https://github.com/mixxxdj/mixxx/pull/4544)
Expand All @@ -347,10 +351,12 @@
[#12537](https://github.com/mixxxdj/mixxx/pull/12537)
* KeyControl: fix keylock/unlock bugs, reset pitch_adjust [4710](https://github.com/mixxxdj/mixxx/pull/4710)
* Looping: fix asserts for loop move [#11735](https://github.com/mixxxdj/mixxx/pull/11735)
* Looping: reset loop_end_pos on eject [#12224](https://github.com/mixxxdj/mixxx/pull/12224) [#12223](https://github.com/mixxxdj/mixxx/issues/12223)
* Fix Loop_out not seeking back [#12739](https://github.com/mixxxdj/mixxx/pull/12739) [#12742](https://github.com/mixxxdj/mixxx/pull/12742)
* ReadAheadManager: fix loop wraparound reader condition [#11717](https://github.com/mixxxdj/mixxx/pull/11717)
* Slip mode: consider loop for background position only if it was enabled before slip [#11848](https://github.com/mixxxdj/mixxx/pull/11848) [#11844](https://github.com/mixxxdj/mixxx/issues/11844)
* Looping: reset loop_end_pos on eject [#12224](https://github.com/mixxxdj/mixxx/pull/12224) [#12223](https://github.com/mixxxdj/mixxx/issues/12223)
* Make decks' xfader assignment persistent [#12074](https://github.com/mixxxdj/mixxx/pull/12074) [#10122](https://github.com/mixxxdj/mixxx/issues/10122)
* Fix gain issue with cloned tracks [#12435](https://github.com/mixxxdj/mixxx/pull/12435) [#10550](https://github.com/mixxxdj/mixxx/issues/10550)

### Controller Mappings

Expand Down Expand Up @@ -380,6 +386,7 @@
[#12409](https://github.com/mixxxdj/mixxx/pull/12409)
[#12510](https://github.com/mixxxdj/mixxx/pull/12510)
* Various mappings: Fix `waveform_zoom` ranges [#12393](https://github.com/mixxxdj/mixxx/pull/12393)
* Various mappings: Ensure required samplers are created [#12769](https://github.com/mixxxdj/mixxx/pull/12769)

### Controller Backend

Expand Down Expand Up @@ -433,13 +440,15 @@
* Remove deprecated ControlObjects from Skins [#12030](https://github.com/mixxxdj/mixxx/pull/12030)
* Log warning if deprecated control is used [#11972](https://github.com/mixxxdj/mixxx/pull/11972)
* ControlObject alias improvements [#11973](https://github.com/mixxxdj/mixxx/pull/11973)
* Keyboard: Repeat certain control actions if key is held [#12474](https://github.com/mixxxdj/mixxx/pull/12474)
* Keyboard mapping: Repeat certain control actions if key is held [#12474](https://github.com/mixxxdj/mixxx/pull/12474)
* Keyboard mapping: Return triggers doubleclick, move Preview functions to P / Shift+P [#12639](https://github.com/mixxxdj/mixxx/pull/12639)
* Keyboard mapping: Various fixes [#12730](https://github.com/mixxxdj/mixxx/pull/12730)
* Update keyboard sheet [#12578](https://github.com/mixxxdj/mixxx/pull/12578)
* Logging: Add support for `QT_MESSAGE_PATTERN` environment variable
[#3204](https://github.com/mixxxdj/mixxx/pull/3204)
[#3518](https://github.com/mixxxdj/mixxx/pull/3518)
* Avoid issue with `stars_up/_down` ControlObjects [#12591](https://github.com/mixxxdj/mixxx/pull/12591)
* hotcue_X_color control: Fix color not stored in cue [#12733](https://github.com/mixxxdj/mixxx/pull/12733)

### Skins

Expand Down Expand Up @@ -472,11 +481,13 @@
* LateNight: Remove blinking play indicator from mini samplers [#4807](https://github.com/mixxxdj/mixxx/pull/4807)
* LateNight: Add buffer underflow indicator [#4906](https://github.com/mixxxdj/mixxx/pull/4906) [#10978](https://github.com/mixxxdj/mixxx/pull/10978)
* LateNight: Fix xfader icons in samplers and aux units [#12477](https://github.com/mixxxdj/mixxx/pull/12477)
* LateNight: use default RGB waveform colors [#12712](https://github.com/mixxxdj/mixxx/pull/12712)
* Add LateNight (64 Samplers) [#11715](https://github.com/mixxxdj/mixxx/pull/11715)
* Deere: fix skin/library layout (library missing in default view with Qt6) [#11912](https://github.com/mixxxdj/mixxx/pull/11912)
* Deere: use decks' waveform colors for sliders (Vol + pitch) [#12129](https://github.com/mixxxdj/mixxx/pull/12129) [#10240](https://github.com/mixxxdj/mixxx/issues/10240)
* Shade: Remove initial setting of now accessible effect controls [#4398](https://github.com/mixxxdj/mixxx/pull/4398) [#10557](https://github.com/mixxxdj/mixxx/issues/10557)
* Shade: Audio Latency meter fix [#11601](https://github.com/mixxxdj/mixxx/pull/11601)
* Tango: allow to toggle crossfader independently from mixer [#12703](https://github.com/mixxxdj/mixxx/pull/12703) [#12654](https://github.com/mixxxdj/mixxx/issues/12654)
* Fix outdated tooltips
[#11387](https://github.com/mixxxdj/mixxx/pull/11387)
[#11384](https://github.com/mixxxdj/mixxx/issues/11384)
Expand All @@ -493,6 +504,8 @@
* Add `skins:` path alias [#12463](https://github.com/mixxxdj/mixxx/pull/12463)
* Remove `Text`, use `TrackProperty` or `Label` [#12004](https://github.com/mixxxdj/mixxx/pull/12004)
* Beat spinBox/AutoDJ spinbox: Enter & Esc also move focus to library [#4617](https://github.com/mixxxdj/mixxx/pull/4617) [#4845](https://github.com/mixxxdj/mixxx/pull/4845)
* Add effect chain menu button to Deere, polish in Tango [#12735](https://github.com/mixxxdj/mixxx/pull/12735)
* Skins: reload default.qss when (re)loading a skin [#12219](https://github.com/mixxxdj/mixxx/pull/12219)

### Waveforms and GL Widgets

Expand All @@ -505,6 +518,8 @@
[#10416](https://github.com/mixxxdj/mixxx/issues/10416)
[#11734](https://github.com/mixxxdj/mixxx/issues/11734)
[#12466](https://github.com/mixxxdj/mixxx/pull/12466)
[#12678](https://github.com/mixxxdj/mixxx/pull/12678)
[#12731](https://github.com/mixxxdj/mixxx/pull/12731)
* Default to 60 Hz waveform refresh rate [#11918](https://github.com/mixxxdj/mixxx/pull/11918)
* Introduce a VSsync mode driven by a phase locked loop [#12469](https://github.com/mixxxdj/mixxx/pull/12469)
* Make VSync mode 0 refer to the default mode and make ST_PLL the default on macOS, ST_TIMER otherwise [#12489](https://github.com/mixxxdj/mixxx/pull/12489)
Expand Down Expand Up @@ -730,6 +745,7 @@
[#12663](https://github.com/mixxxdj/mixxx/pull/12663)
[#12661](https://github.com/mixxxdj/mixxx/pull/12661)
[#12650](https://github.com/mixxxdj/mixxx/pull/12650)
* Fail early in case Taglib 2.0 is found [#12709](https://github.com/mixxxdj/mixxx/pull/12709)

### Track properties

Expand All @@ -756,6 +772,7 @@
[#12399](https://github.com/mixxxdj/mixxx/pull/12399)
[#11663](https://github.com/mixxxdj/mixxx/pull/11663)
[#11926](https://github.com/mixxxdj/mixxx/pull/11926)
[#12057](https://github.com/mixxxdj/mixxx/pull/12057)
* macOS: set preferences dialog title to the selected page title [#11696](https://github.com/mixxxdj/mixxx/pull/11696)
* macOS: fix the preferences menu and opening the settings directory [#11679](https://github.com/mixxxdj/mixxx/pull/11679)
* macOS: fix slider styling in preferences dialog [#11647](https://github.com/mixxxdj/mixxx/pull/11647)
Expand All @@ -766,17 +783,23 @@
* Library: Add link to settings files info in the manual [#4367](https://github.com/mixxxdj/mixxx/pull/4367)
* Controllers: add search bars to mapping tables [#11165](https://github.com/mixxxdj/mixxx/pull/11165)
* Add 13 new translation languages [#4785](https://github.com/mixxxdj/mixxx/pull/4785) [#9702](https://github.com/mixxxdj/mixxx/issues/9702)
* Join Franch translations to "fr" and remove all untranslated English strings. [#12699](https://github.com/mixxxdj/mixxx/pull/12699)
* Apply changes from all pages when pressing Apply (like when pressing Okay) [#12194](https://github.com/mixxxdj/mixxx/pull/12194)

### Known issues

* Volume / Loudness spikes on Windows with M4A/AAC files.
Last known working version is Windows 10 build 17763.
Affected versions are Windows 10 build 19041 and Windows 11 build 22000.
A fix is promised in 2024-02 with Windows 11 build 26016.
[#12289](https://github.com/mixxxdj/mixxx/issues/12289)
[#11094](https://github.com/mixxxdj/mixxx/issues/11094)
* macOS: Library entries are now sorted using the language depending Unicode Collation Algorithm (UCA).
[#12517](https://github.com/mixxxdj/mixxx/issues/12517)
* macOS: Visual glitches with the main EQ sliders
[#12517](https://github.com/mixxxdj/mixxx/issues/12630)
* Linux: possible crash when enabling a MIDI controller [#12001](https://github.com/mixxxdj/mixxx/issues/12001)
Introduce with Qt 5.15.5, fixed in Qt 5.15.17 and Qt 6.6.3
* Extra Samplers are created during startup, when found in a saved Sampler Bank [#12657](https://github.com/mixxxdj/mixxx/pull/12657) [#12809](https://github.com/mixxxdj/mixxx/pull/12809)

## [2.3.6](https://github.com/mixxxdj/mixxx/milestone/40) (2023-08-15)

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3046,7 +3046,7 @@ target_link_libraries(mixxx-lib PRIVATE SoundTouch::SoundTouch)

# TagLib
find_package(TagLib 1.11 REQUIRED)
target_link_libraries(mixxx-lib PRIVATE TagLib::TagLib)
target_link_libraries(mixxx-lib PUBLIC TagLib::TagLib)
if (NOT TagLib_VERSION VERSION_LESS 2.0.0)
message(FATAL_ERROR "Installed Taglib ${TagLib_VERSION} is not supported. Use Version >= 1.11 and < 2.0 and its development headers.")
# Dear package maintainer: Do not patch away this fatal error
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindChromaprint.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ endif()

find_path(Chromaprint_INCLUDE_DIR
NAMES chromaprint.h
PATHS ${PC_Chromaprint_INCLUDE_DIRS}
HINTS ${PC_Chromaprint_INCLUDE_DIRS}
PATH_SUFFIXES chromaprint
DOC "Chromaprint include directory")
mark_as_advanced(Chromaprint_INCLUDE_DIR)

find_library(Chromaprint_LIBRARY
NAMES chromaprint chromaprint_p
PATHS ${PC_Chromaprint_LIBRARY_DIRS}
HINTS ${PC_Chromaprint_LIBRARY_DIRS}
DOC "Chromaprint library"
)
mark_as_advanced(Chromaprint_LIBRARY)
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindDjInterop.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ endif()

find_path(DjInterop_INCLUDE_DIR
NAMES djinterop/djinterop.hpp
PATHS ${PC_DjInterop_INCLUDE_DIRS}
HINTS ${PC_DjInterop_INCLUDE_DIRS}
DOC "DjInterop include directory")
mark_as_advanced(DjInterop_INCLUDE_DIR)

find_library(DjInterop_LIBRARY
NAMES djinterop
PATHS ${PC_DjInterop_LIBRARY_DIRS}
HINTS ${PC_DjInterop_LIBRARY_DIRS}
DOC "DjInterop library"
)
mark_as_advanced(DjInterop_LIBRARY)
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindEbur128.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ endif()

find_path(Ebur128_INCLUDE_DIR
NAMES ebur128.h
PATHS ${PC_Ebur128_INCLUDE_DIRS}
HINTS ${PC_Ebur128_INCLUDE_DIRS}
PATH_SUFFIXES ebur128
DOC "Ebur128 include directory")
mark_as_advanced(Ebur128_INCLUDE_DIR)

find_library(Ebur128_LIBRARY
NAMES ebur128
PATHS ${PC_Ebur128_LIBRARY_DIRS}
HINTS ${PC_Ebur128_LIBRARY_DIRS}
DOC "Ebur128 library"
)
mark_as_advanced(Ebur128_LIBRARY)
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindFLAC.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ endif()

find_path(FLAC_INCLUDE_DIR
NAMES FLAC/all.h
PATHS ${PC_FLAC_INCLUDE_DIRS}
HINTS ${PC_FLAC_INCLUDE_DIRS}
DOC "FLAC include directory")
mark_as_advanced(FLAC_INCLUDE_DIR)

find_library(FLAC_LIBRARY
NAMES FLAC
PATHS ${PC_FLAC_LIBRARY_DIRS}
HINTS ${PC_FLAC_LIBRARY_DIRS}
DOC "FLAC library"
)
mark_as_advanced(FLAC_LIBRARY)
Expand Down
8 changes: 4 additions & 4 deletions cmake/modules/FindGPerfTools.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -57,26 +57,26 @@ endif()

find_path(GPerfTools_TCMALLOC_INCLUDE_DIR
NAMES gperftools/tcmalloc.h
PATHS ${PC_GPerfTools_TCMALLOC_INCLUDE_DIRS}
HINTS ${PC_GPerfTools_TCMALLOC_INCLUDE_DIRS}
DOC "tcmalloc include directory")
mark_as_advanced(GPerfTools_TCMALLOC_INCLUDE_DIR)

find_library(GPerfTools_TCMALLOC_LIBRARY
NAMES tcmalloc
PATHS ${PC_GPerfTools_TCMALLOC_LIBRARY_DIRS}
HINTS ${PC_GPerfTools_TCMALLOC_LIBRARY_DIRS}
DOC "tcmalloc library"
)
mark_as_advanced(GPerfTools_TCMALLOC_LIBRARY)

find_path(GPerfTools_PROFILER_INCLUDE_DIR
NAMES gperftools/profiler.h
PATHS ${PC_GPerfTools_PROFILER_INCLUDE_DIRS}
HINTS ${PC_GPerfTools_PROFILER_INCLUDE_DIRS}
DOC "profiler include directory")
mark_as_advanced(GPerfTools_PROFILER_INCLUDE_DIR)

find_library(GPerfTools_PROFILER_LIBRARY
NAMES profiler
PATHS ${PC_GPerfTools_PROFILER_LIBRARY_DIRS}
HINTS ${PC_GPerfTools_PROFILER_LIBRARY_DIRS}
DOC "profiler library"
)
mark_as_advanced(GPerfTools_PROFILER_LIBRARY)
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindID3Tag.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ endif()

find_path(ID3Tag_INCLUDE_DIR
NAMES id3tag.h
PATHS ${PC_ID3Tag_INCLUDE_DIRS}
HINTS ${PC_ID3Tag_INCLUDE_DIRS}
PATH_SUFFIXES id3tag
DOC "ID3Tag include directory")
mark_as_advanced(ID3Tag_INCLUDE_DIR)

find_library(ID3Tag_LIBRARY
NAMES id3tag
PATHS ${PC_ID3Tag_LIBRARY_DIRS}
HINTS ${PC_ID3Tag_LIBRARY_DIRS}
DOC "ID3Tag library"
)
mark_as_advanced(ID3Tag_LIBRARY)
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindJACK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ endif()

find_path(JACK_INCLUDE_DIR
NAMES jack/jack.h
PATHS ${PC_JACK_INCLUDE_DIRS}
HINTS ${PC_JACK_INCLUDE_DIRS}
DOC "JACK include directory")
mark_as_advanced(JACK_INCLUDE_DIR)

find_library(JACK_LIBRARY
NAMES jack
PATHS ${PC_JACK_LIBRARY_DIRS}
HINTS ${PC_JACK_LIBRARY_DIRS}
DOC "JACK library"
)
mark_as_advanced(JACK_LIBRARY)
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindKeyFinder.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ endif()

find_path(KeyFinder_INCLUDE_DIR
NAMES keyfinder/keyfinder.h
PATHS ${PC_KeyFinder_INCLUDE_DIRS}
HINTS ${PC_KeyFinder_INCLUDE_DIRS}
DOC "KeyFinder include directory")
mark_as_advanced(KeyFinder_INCLUDE_DIR)

find_library(KeyFinder_LIBRARY
NAMES keyfinder
PATHS ${PC_KeyFinder_LIBRARY_DIRS}
HINTS ${PC_KeyFinder_LIBRARY_DIRS}
DOC "KeyFinder library"
)
mark_as_advanced(KeyFinder_LIBRARY)
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindLibUSB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ endif()
find_path(LibUSB_INCLUDE_DIR
NAMES libusb.h
PATH_SUFFIXES libusb libusb-1.0
PATHS ${PC_LibUSB_INCLUDE_DIRS}
HINTS ${PC_LibUSB_INCLUDE_DIRS}
DOC "LibUSB include directory"
)
mark_as_advanced(LibUSB_INCLUDE_DIR)

find_library(LibUSB_LIBRARY
NAMES usb-1.0 usb
PATHS ${PC_LibUSB_LIBRARY_DIRS}
HINTS ${PC_LibUSB_LIBRARY_DIRS}
DOC "LibUSB library"
)
mark_as_advanced(LibUSB_LIBRARY)
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindMAD.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ endif()

find_path(MAD_INCLUDE_DIR
NAMES mad.h
PATHS ${PC_MAD_INCLUDE_DIRS}
HINTS ${PC_MAD_INCLUDE_DIRS}
PATH_SUFFIXES mad
DOC "MAD include directory")
mark_as_advanced(MAD_INCLUDE_DIR)

find_library(MAD_LIBRARY
NAMES mad
PATHS ${PC_MAD_LIBRARY_DIRS}
HINTS ${PC_MAD_LIBRARY_DIRS}
DOC "MAD library"
)
mark_as_advanced(MAD_LIBRARY)
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindMP4.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ endif()

find_path(MP4_INCLUDE_DIR
NAMES mp4/mp4.h
PATHS ${PC_MP4_INCLUDE_DIRS}
HINTS ${PC_MP4_INCLUDE_DIRS}
DOC "MP4 include directory")
mark_as_advanced(MP4_INCLUDE_DIR)

find_library(MP4_LIBRARY
NAMES mp4
PATHS ${PC_MP4_LIBRARY_DIRS}
HINTS ${PC_MP4_LIBRARY_DIRS}
DOC "MP4 library"
)
mark_as_advanced(MP4_LIBRARY)
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/FindMP4v2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ endif()

find_path(MP4v2_INCLUDE_DIR
NAMES mp4v2/mp4v2.h
PATHS ${PC_MP4v2_INCLUDE_DIRS}
HINTS ${PC_MP4v2_INCLUDE_DIRS}
DOC "MP4v2 include directory")
mark_as_advanced(MP4v2_INCLUDE_DIR)

find_library(MP4v2_LIBRARY
NAMES mp4v2
PATHS ${PC_MP4v2_LIBRARY_DIRS}
HINTS ${PC_MP4v2_LIBRARY_DIRS}
DOC "MP4v2 library"
)
mark_as_advanced(MP4v2_LIBRARY)
Expand Down
Loading

0 comments on commit 168c921

Please sign in to comment.