diff --git a/.travis.yml b/.travis.yml index ebaa7985..0635f43f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,12 @@ language: cpp sudo: required -dist: bionic -matrix: - include: - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-9 - env: - - MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" - compiler: - - gcc +dist: focal before_install: - eval "${MATRIX_EVAL}" - sudo apt-get install build-essential cmake libboost-all-dev libconfig++-dev libavcodec-dev libavutil-dev libavformat-dev ffmpeg libgraphicsmagick++1-dev libpstreams-dev libconfig++-dev libpstreams-dev libtag1-dev libpam0g-dev - git clone https://github.com/emweb/wt.git wt - pushd wt; -- git checkout 4.2.1 +- git checkout 4.4.0 - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr && sudo make install - popd script: cmake -DCMAKE_BUILD_TYPE=Release . && make && make test diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d84e7d3..6099f285 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ find_package(PkgConfig REQUIRED) find_package(Filesystem REQUIRED) find_package(FFMPEGAV REQUIRED) find_package(Taglib REQUIRED) -find_package(Boost REQUIRED COMPONENTS system) +find_package(Boost REQUIRED COMPONENTS system program_options) find_package(PStreams REQUIRED) find_package(PAM) pkg_check_modules(GRAPHICSMAGICKXX REQUIRED GraphicsMagick++) diff --git a/approot/artist.xml b/approot/artist.xml index 3e7bca0a..301682b6 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -24,7 +24,7 @@

${tr:Lms.Explore.links}

- ${mbid-link class="text-muted"} + ${mbid-link class="Lms-btn text-muted"}
${} @@ -41,7 +41,7 @@
${name class="Lms-releasename text-primary"}
- ${}
${artist class="Lms-artistname text-muted"}
${} + ${}
${artist class="Lms-btn Lms-artistname text-muted"}
${}
${}${year}${}${} (${orig-year})${}
diff --git a/approot/artists.xml b/approot/artists.xml index 83d44747..2f29fbb6 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -4,7 +4,6 @@
-

${tr:Lms.Explore.artists}

${mode class="nav nav-pills Lms-explore-mode-container"}
@@ -18,13 +17,13 @@
-

${name class="Lms-artistname text-primary"}

+

${name class="Lms-btn Lms-artistname text-primary"}
- ${name class="Lms-artistname text-primary"} + ${name class="Lms-btn Lms-artistname text-primary"}
diff --git a/approot/explore.xml b/approot/explore.xml index 80881197..a1a84291 100644 --- a/approot/explore.xml +++ b/approot/explore.xml @@ -5,8 +5,8 @@ ${contents class="Lms-explore-contents"} - - + + ${add-filter class="btn-sm btn-info"} ${clusters class="Lms-explore-clusters"} diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml index 43f0ff45..1d0c8990 100644 --- a/approot/mediaplayer.xml +++ b/approot/mediaplayer.xml @@ -9,18 +9,18 @@
-
+
- +
diff --git a/approot/messages.xml b/approot/messages.xml index 146afb5e..dad967c1 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -115,6 +115,7 @@ Add filter All Artists +Download Filter added Filters Links @@ -127,8 +128,11 @@ Recently added Recently played Albums +Star +Starred Tracks Type +Unstar Value Various artists diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index 11dc324e..955938ae 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -115,6 +115,7 @@ Ajouter filtre Tous Artistes +Télécharger Filtre ajouté Filtres Liens @@ -127,8 +128,11 @@ Ajoutés récemment Joués récemment Albums +Ajouter aux favoris +Favoris Pistes Type +Retirer des favoris Valeur Artistes divers diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 3fb28e46..c121fd6a 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -2,16 +2,15 @@ - - - - + + + +
-

${tr:Lms.PlayQueue.playqueue}

${clear-btn}${shuffle-btn}${repeat-btn}${radio-btn}

${nb-tracks}

@@ -21,8 +20,8 @@
- - + +
@@ -34,7 +33,7 @@
${name}
${} - ${}${release class="Lms-releasename text-primary"}${} + ${}${release class="Lms-btn Lms-releasename text-primary"}${} ${}${artists}${} ${}
@@ -50,7 +49,7 @@ - ${artist class="Lms-artistname text-muted"} + ${artist class="Lms-btn Lms-artistname text-muted"} diff --git a/approot/release.xml b/approot/release.xml index cb49ffd7..1a720e34 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -14,7 +14,7 @@

${name}

- ${}

${artist class="Lms-artistname text-muted"}

${} + ${}

${artist class="Lms-btn Lms-artistname text-muted"}

${}
${}${year}${}${} (${orig-year})${}
${clusters} ${play-btn}${more-btn} @@ -45,7 +45,7 @@

${tr:Lms.Explore.links}

- ${mbid-link class="text-muted"} + ${mbid-link class="Lms-btn text-muted"}
${} @@ -78,7 +78,7 @@ - ${artist class="Lms-artistname text-muted"} + ${artist class="Lms-btn Lms-artistname text-muted"} diff --git a/approot/releases.xml b/approot/releases.xml index 430e48dd..091dcd34 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -4,7 +4,6 @@
-

${tr:Lms.Explore.releases}

${mode class="nav nav-pills Lms-explore-mode-container"} ${play-btn}${more-btn}
@@ -21,8 +20,8 @@ ${cover}
-
${release-name class="Lms-releasename text-primary"}
-
${}${year}${}${}${artist-name class="Lms-artistname text-muted"}${}
+
${release-name class="Lms-btn Lms-releasename text-primary"}
+
${}${year}${}${}${artist-name class="Lms-btn Lms-artistname text-muted"}${}
diff --git a/approot/templates.xml b/approot/templates.xml index 2145b7f7..5be1e07d 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -11,17 +11,17 @@ - ${title class="navbar-brand"} + ${title class="navbar-brand Lms-btn"}
${search class="form-control"}
    -
  • ${artists}
    • -
  • ${releases}
    • -
  • ${tracks}
    • -
  • ${playqueue}
    • +
  • ${artists class="Lms-btn"}
    • +
  • ${releases class="Lms-btn"}
    • +
  • ${tracks class="Lms-btn"}
    • +
  • ${playqueue class="Lms-btn"}
${filters class="form-group Lms-clusters-control"} @@ -29,7 +29,7 @@
    ${}
  • - +