Merged v0.2.7 development branch

ebruck · Oct 20, 2019 · 3141066 · 3141066
1 parent c34a985
commit 3141066
Show file tree

Hide file tree

Showing 26 changed files with 289 additions and 165 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -47,12 +47,24 @@ jobs:
       - image: "radiotrayng/circleci:ubuntu-19.04"
     environment:
       - CI_OS: linux
+  Ubuntu-19_10-build:
+    <<: *commonStepsUbuntu
+    docker:
+      - image: "radiotrayng/circleci:ubuntu-19.10"
+    environment:
+      - CI_OS: linux
   Fedora-30-build:
     <<: *commonStepsFedora
     docker:
       - image: "radiotrayng/circleci:fedora-30"
     environment:
       - CI_OS: linux
+  Fedora-31-build:
+    <<: *commonStepsFedora
+    docker:
+      - image: "radiotrayng/circleci:fedora-31"
+    environment:
+      - CI_OS: linux
 
 workflows:
   version: 2
@@ -61,4 +73,6 @@ workflows:
       - Ubuntu-16_04-build
       - Ubuntu-18_04-build
       - Ubuntu-19_04-build
+      - Ubuntu-19_10-build
       - Fedora-30-build
+      - Fedora-31-build
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(radiotray-ng VERSION 0.2.5 LANGUAGES CXX)
+project(radiotray-ng CXX)
 
 # workaround for Eclipse
 if (${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4")
@@ -13,7 +13,7 @@ endif()
 # version for user agent creation
 set(PROJECT_VERSION_MAJOR 0)
 set(PROJECT_VERSION_MINOR 2)
-set(PROJECT_VERSION_PATCH 6)
+set(PROJECT_VERSION_PATCH 7)
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 # output dir
@@ -30,6 +30,19 @@ endif(CCACHE_FOUND)
 find_package(CURL      REQUIRED)
 find_package(PkgConfig REQUIRED)
 find_package(Boost     REQUIRED filesystem system log program_options thread)
+
+# set up wxWidgets to prefer gtk3
+execute_process(COMMAND wx-config --selected-config --toolkit=gtk3
+		RESULT_VARIABLE ret
+		OUTPUT_QUIET)
+if(ret EQUAL "0")
+	message(STATUS "wxWidgets: Found gtk3 version, using it.")
+	set(wxWidgets_CONFIG_OPTIONS_DEFAULT "--toolkit=gtk3")
+else()
+	message(STATUS "wxWidgets: No gtk3 version found, falling back to default (likely gtk2)")
+endif()
+unset(ret)
+set(wxWidgets_CONFIG_OPTIONS "${wxWidgets_CONFIG_OPTIONS_DEFAULT}" ON STRING "wxWidgets toolkit options")
 find_package(wxWidgets REQUIRED core base adv)
 
 pkg_search_module(JSONCPP     REQUIRED jsoncpp)
@@ -43,7 +56,7 @@ endif(NOT APPLE)
 set(CMAKE_CXX_STANDARD 14)
 add_definitions("-DBOOST_LOG_DYN_LINK")
 add_compile_options("-fdiagnostics-color=auto")
-set(warnings "-Wno-deprecated-declarations -Wall -Wextra -Werror -Wpedantic")
+set(warnings "-Wall -Wextra -Werror -Wpedantic")
 set(CMAKE_CXX_FLAGS ${warnings})
 set(CMAKE_C_FLAGS   ${warnings})
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")

diff --git a/README.md b/README.md
@@ -80,6 +80,7 @@ A config (radiotray-ng.json) is created in your ~/.config/radiotray-ng directory
    "tag-info-verbose" : true,
    "volume-level" : 100,
    "volume-step" : 1,
+   "volume-max-level" : 200,
    "wrap-track-info" : true,
    "wrap-track-info-len" : 40,
    "media-key-mapping" : false,
@@ -114,6 +115,7 @@ A config (radiotray-ng.json) is created in your ~/.config/radiotray-ng directory
           tag-info-verbose: displays in the menu stream information such as bitrate etc.
            track-info-copy: enable/disable track clicking to copy into clipboard 
                volume-step: value used to increment/decrement the volume level
+          volume-max-level: maximum volume level
            wrap-track-info: enable/disable the wrapping of title & artist menu text
        wrap-track-info-len: maximum title & artist line length 
          media-key-mapping: enable the mapping of media keys to volume up/down etc. (Previous, Next, Rewind, FastForward etc.)
@@ -232,12 +234,16 @@ Download a release or clone the repo and build the latest Debian package.
 
 https://github.com/ebruck/radiotray-ng/releases
 
+## Fedora Install ##
+```
+$ dnf install radiotray-ng
+``` 
 
 ## To Build on Ubuntu: ##
 
 Install these packages:
 ```
-lsb-release libcurl4-openssl-dev libjsoncpp-dev libxdg-basedir-dev libnotify-dev libboost-filesystem-dev libgstreamer1.0-dev libappindicator3-dev libboost-log-dev libboost-program-options-dev libgtk-3-dev libnotify-dev lsb-release libbsd-dev libncurses5-dev libglibmm-2.4-dev libwxgtk3.0-dev libwxgtk3.0-0v5 cmake
+lsb-release libcurl4-openssl-dev libjsoncpp-dev libxdg-basedir-dev libnotify-dev libboost-filesystem-dev libgstreamer1.0-dev libappindicator3-dev libboost-log-dev libboost-program-options-dev libgtk-3-dev libnotify-dev lsb-release libbsd-dev libncurses5-dev libglibmm-2.4-dev libwxgtk3.0-gtk3-dev libwxgtk3.0-gtk3-0v5 cmake
 ```
 
 ## Build Radiotray-NG & Debian Package ##

diff --git a/data/bookmarks.json b/data/bookmarks.json
@@ -1,246 +1,199 @@
 [
    {
       "group" : "Jazz",
-      "image" : null,
       "stations" : [
          {
-            "image" : null,
             "name" : "Smooth Jazz",
             "url" : "http://smoothjazz.com/streams/smoothjazz_128.pls"
          },
          {
-            "image" : null,
             "name" : "Sonic Universe",
             "url" : "http://somafm.com/sonicuniverse.pls"
          }
       ]
    },
    {
       "group" : "Latin",
-      "image" : null,
       "stations" : [
          {
-            "image" : null,
             "name" : "Top Latino Radio",
             "url" : "http://online.radiodifusion.net:8020/listen.pls"
          },
          {
-            "image" : null,
             "name" : "Reggaeton 24/7",
             "url" : "http://cc.net2streams.com/tunein.php/reggaeton/playlist.pls"
          }
       ]
    },
    {
       "group" : "Classic Rock",
-      "image" : null,
       "stations" : [
          {
-            "image" : null,
             "name" : "181.FM Classic Hits",
             "url" : "http://www.181.fm/winamp.pls?station=181-greatoldies&file=181-greatoldies.pls"
          },
          {
-            "image" : null,
             "name" : ".977 Classic Rock",
             "url" : "http://www.977music.com/tunein/web/classicrock.asx"
          },
          {
-            "image" : null,
             "name" : "Covers",
             "url" : "http://somafm.com/covers.pls"
          }
       ]
    },
    {
       "group" : "Classical",
-      "image" : null,
       "stations" : [
          {
-            "image" : null,
             "name" : "KDFC",
             "url" : "http://provisioning.streamtheworld.com/pls/KDFCFM.pls"
          },
          {
-            "image" : null,
             "name" : "Classic FM",
             "url" : "http://media-ice.musicradio.com/ClassicFMMP3.m3u"
          },
          {
-            "image" : null,
             "name" : "WCPE",
             "url" : "http://www.ibiblio.org/wcpe/wcpe.pls"
          },
          {
-            "image" : null,
             "name" : "CINEMIX",
             "url" : "http://cinemix.us/cine.asx"
          },
          {
-            "image" : null,
             "name" : "WQXR",
             "url" : "http://www.wqxr.org/stream/wqxr/mp3.pls"
          },
          {
-            "image" : null,
             "name" : "BBC Radio 3",
             "url" : "http://bbcmedia.ic.llnwd.net/stream/bbcmedia_radio3_mf_p"
          }
       ]
    },
    {
       "group" : "Pop / Rock",
-      "image" : null,
       "stations" : [
          {
-            "image" : null,
             "name" : "Radio Paradise",
             "url" : "http://www.radioparadise.com/musiclinks/rp_128.m3u"
          },
          {
-            "image" : null,
             "name" : ".977 The Hitz Channel",
             "url" : "http://www.977music.com/tunein/web/hitz.asx"
          },
          {
-            "image" : null,
             "name" : "Indie Pop Rocks!",
             "url" : "http://somafm.com/indiepop.pls"
          },
          {
-            "image" : null,
             "name" : "PopTron",
             "url" : "http://somafm.com/poptron.pls"
          }
       ]
    },
    {
       "group" : "Oldies",
-      "image" : null,
       "stations" : [
          {
-            "image" : null,
             "name" : "ABN Antioch OTR",
             "url" : "http://radio.macinmind.com/listen.m3u"
          },
          {
-            "image" : null,
             "name" : "AM600 Conyers OTR",
             "url" : "http://www.conyersradio.net/listen.m3u"
          },
          {
-            "image" : null,
             "name" : "Rumsey Retro Radio",
             "url" : "https://www.rumseyretro.ca/assets/rumseyretro.pls"
          },
          {
-            "image" : null,
             "name" : "WNAR-AM Radio",
             "url" : "http://live.wnar-am.com:8500/listen.pls"
          }
       ]
    },
    {
       "group" : "Chill",
-      "image" : null,
       "stations" : [
          {
-            "image" : null,
             "name" : "Lounge Radio",
             "url" : "http://www.lounge-radio.com/listen128.m3u"
          },
          {
-            "image" : null,
             "name" : "Beat Blender",
             "url" : "http://somafm.com/beatblender.pls"
          },
          {
-            "image" : null,
             "name" : "Secret Agent",
             "url" : "http://somafm.com/secretagent.pls"
          },
          {
-            "image" : null,
             "name" : "Groove Salad",
             "url" : "http://somafm.com/groovesalad.pls"
          },
          {
-            "image" : null,
             "name" : "Illinois Street Lounge",
             "url" : "http://somafm.com/illstreet.pls"
          }
       ]
    },
    {
       "group" : "Country",
-      "image" : null,
       "stations" : [
          {
-            "image" : null,
             "name" : "Boot Liquor",
             "url" : "http://somafm.com/bootliquor.pls"
          },
          {
-            "image" : null,
             "name" : "Highway 181",
             "url" : "http://www.181.fm/winamp.pls?station=181-highway&file=181-highway.pls"
          },
          {
-            "image" : null,
             "name" : "Country 108",
             "url" : "http://www.country108.com/listen.pls"
          },
          {
-            "image" : null,
             "name" : "WAMU Bluegrass Country",
             "url" : "http://ice24.securenetsystems.net/WAMU2"
          }
       ]
    },
    {
       "group" : "Techno / Electronic",
-      "image" : null,
       "stations" : [
          {
-            "image" : null,
             "name" : "Drone Zone",
             "url" : "http://somafm.com/dronezone.pls"
          },
          {
-            "image" : null,
             "name" : "Space Station Soma",
             "url" : "http://somafm.com/spacestation.pls"
          },
          {
-            "image" : null,
             "name" : "cliqhop idm",
             "url" : "http://somafm.com/cliqhop.pls"
          },
          {
-            "image" : null,
             "name" : "Black Rock FM",
             "url" : "http://somafm.com/brfm.pls"
          },
          {
-            "image" : null,
             "name" : "New Dance Radio",
             "url" : "http://jbstream.net/tunein.php/blackoutworm/playlist.asx"
          },
          {
-            "image" : null,
             "name" : "DubStep Beyond",
             "url" : "http://somafm.com/play/dubstep32"
          }
       ]
    },
    {
       "group" : "Community",
-      "image" : null,
       "stations" : [
          {
-            "image" : null,
-            "name" : "Jupiter Broadcast",
-            "url" : "http://jblive.fm/"
+            "name" : "Jupiter Broadcasting",
+            "url" : "http://jblive.stream/"
          }
       ]
    }

diff --git a/docker/fedora/31/Dockerfile b/docker/fedora/31/Dockerfile
@@ -0,0 +1,6 @@
+FROM fedora:31
+
+RUN set -ex; \
+    dnf -y update \
+    && dnf -y install git openssh-clients rpm-build redhat-lsb cmake libcurl-devel boost-devel wxGTK3-devel jsoncpp-devel gstreamer1-devel libxdg-basedir-devel libbsd-devel libappindicator-gtk3-devel libnotify-devel glibmm24-devel \
+    && dnf clean all
diff --git a/docker/rebuild_and_publish.sh b/docker/rebuild_and_publish.sh
@@ -11,5 +11,11 @@ docker push radiotrayng/circleci:ubuntu-18.04
 docker build -t radiotrayng/circleci:ubuntu-19.04 - <ubuntu/19.04/Dockerfile
 docker push radiotrayng/circleci:ubuntu-19.04
 
+docker build -t radiotrayng/circleci:ubuntu-19.10 - <ubuntu/19.10/Dockerfile
+docker push radiotrayng/circleci:ubuntu-19.10
+
 docker build -t radiotrayng/circleci:fedora-30 - <fedora/30/Dockerfile
 docker push radiotrayng/circleci:fedora-30
+
+docker build -t radiotrayng/circleci:fedora-31 - <fedora/31/Dockerfile
+docker push radiotrayng/circleci:fedora-31