Merged v0.2.6 development branch

.circleci/config.yml

@@ -0,0 +1,64 @@
+commonStepsUbuntu: &commonStepsUbuntu
+    steps:
+      # Each step starts in the checked-out source directory.
+      - checkout
+      - run: git fetch --tags && git tag
+      - run:
+          name: Make project
+          command: 'mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release && make package'
+      - run:
+          name: Copy artifacts to tmp
+          command: 'mkdir /artifacts && cd build && cp *.deb /artifacts'
+      - store_artifacts:
+          path: /artifacts
+
+commonStepsFedora: &commonStepsFedora
+    steps:
+      # Each step starts in the checked-out source directory.
+      - checkout
+      - run: git fetch --tags && git tag
+      - run:
+          name: Make project
+          command: 'mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DCPACK_GENERATOR=RPM && make package'
+      - run:
+          name: Copy artifacts to tmp
+          command: 'mkdir /artifacts && cd build && cp *.rpm /artifacts'
+      - store_artifacts:
+          path: /artifacts
+
+version: 2.1
+
+jobs:
+  Ubuntu-16_04-build:
+    <<: *commonStepsUbuntu
+    docker:
+      - image: "radiotrayng/circleci:ubuntu-16.04"
+    environment:
+      - CI_OS: linux
+  Ubuntu-18_04-build:
+    <<: *commonStepsUbuntu
+    docker:
+      - image: "radiotrayng/circleci:ubuntu-18.04"
+    environment:
+      - CI_OS: linux
+  Ubuntu-19_04-build:
+    <<: *commonStepsUbuntu
+    docker:
+      - image: "radiotrayng/circleci:ubuntu-19.04"
+    environment:
+      - CI_OS: linux
+  Fedora-30-build:
+    <<: *commonStepsFedora
+    docker:
+      - image: "radiotrayng/circleci:fedora-30"
+    environment:
+      - CI_OS: linux
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - Ubuntu-16_04-build
+      - Ubuntu-18_04-build
+      - Ubuntu-19_04-build
+      - Fedora-30-build

CMakeLists.txt

@@ -13,7 +13,7 @@ endif()
 # version for user agent creation
 set(PROJECT_VERSION_MAJOR 0)
 set(PROJECT_VERSION_MINOR 2)
-set(PROJECT_VERSION_PATCH 5)
+set(PROJECT_VERSION_PATCH 6)
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 # output dir
@@ -96,7 +96,7 @@ endif()
 
 set(BUILD_SHARED_LIBS NO)
 
-add_subdirectory(debian)
+add_subdirectory(package)
 add_subdirectory(src/radiotray-ng)
 add_subdirectory(src/radiotray-ng/config)
 add_subdirectory(src/radiotray-ng/playlist)

README.md

@@ -1,4 +1,5 @@
 # Radiotray-NG: An Internet radio player for Linux #
+[![CircleCI](https://circleci.com/gh/ebruck/radiotray-ng/tree/master.svg?style=shield)](https://circleci.com/gh/ebruck/radiotray-ng/tree/master)
 
 It became clear as one of the early contributors to the RadioTray project that it
 was not getting the attention it required and was probably dead. A lot of the 
@@ -64,6 +65,7 @@ A config (radiotray-ng.json) is created in your ~/.config/radiotray-ng directory
    "buffer-size" : 320000,
    "compact-menu" : false,
    "debug-logging" : false,
+   "disable-logging" : false,
    "file-monitor" : true,
    "file-monitor-interval" : 10,
    "invert-menu" : false,
@@ -100,6 +102,7 @@ A config (radiotray-ng.json) is created in your ~/.config/radiotray-ng directory
            buffer-duration: number of seconds to buffer
              compact-menu : enable/disable the use of menu separators
              debug-logging: enable/disable verbose debug logging
+           disable-logging: enable/disable logging
               file-monitor: enable/disable notifcation of bookmark file changes
      file-monitor-interval: time in seconds to poll for bookmark file changes
               invert-menu : menu rendered in reverse order
@@ -188,20 +191,21 @@ The editor supports all of the typical editor operations including adding, editi
 ```
 Available commands:
 
-    volume_up
-    volume_down
-    set_volume 'level'
-    play
-    play_url 'url'
-    stop
-    quit
-    previous_station
-    reload_bookmarks
-    next_station
     get_bookmarks
     get_config
     get_player_state
+    play
     play_station 'group' 'station'
+    play_url 'url'
+    previous_station
+    next_station
+    reload_bookmarks
+    set_volume 'level'        
+    volume_down
+    volume_up
+    mute
+    stop
+    quit
 ```
 ```
 Example:
@@ -213,9 +217,11 @@ $ qdbus com.github.radiotray_ng /com/github/radiotray_ng com.github.radiotray_ng
    "codec" : "MPEG-1 Layer 3 (MP3)",
    "group" : "Old Time Radio",
    "image" : "radiotray-ng-notification",
+   "mute" : false,
    "state" : "playing",
    "station" : "AM 1710 Antioch OTR",
    "title" : "Jul 15, 1948: Summer Night w/Ida Lupino",
+   "url" : "http://radio.macinmind.com/listen.m3u",
    "volume" : "15"
 }
 ```
@@ -242,7 +248,7 @@ $ mkdir build
 $ cd build
 $ cmake .. -DCMAKE_BUILD_TYPE=Release
 $ make package
-$ sudo dpkg -i ./radiotray-ng_x.y.z_<i386|amd64>.deb
+$ sudo dpkg -i ./radiotray-ng_x.y.z_<distro>_<i386|amd64>.deb
 $ sudo apt-get install -f
 ```
 
@@ -254,15 +260,25 @@ $ mkdir build
 $ cd build
 $ cmake .. -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug
 $ make package
-$ sudo dpkg -i ./radiotray-ng_x.y.z_<i386|amd64>.deb
+$ sudo dpkg -i ./radiotray-ng_x.y.z_<distro>_<i386|amd64>.deb
 $ sudo apt-get install -f
 ```
 
 ## To Build on Fedora: ##
 
 Install these packages:
 ```
-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
+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 rpm-build
+```
+
+```
+$ git clone https://github.com/ebruck/radiotray-ng.git
+$ cd radiotray-ng
+$ mkdir build
+$ cd build
+$ cmake .. -DCMAKE_BUILD_TYPE=Release
+$ make package
+$ sudo dnf install ./radiotray-ng_x.y.z_<distro>_<i386|x86_64>.rpm
 ```
-### Thank you JetBrains for providing a free open source license for [CLion](https://www.jetbrains.com/clion/).
 
+### Thank you JetBrains for providing a free open source license for [CLion](https://www.jetbrains.com/clion/).

cmake/rtng_user_agent.hpp.in

@@ -1,4 +1,4 @@
-// Copyright 2017 Edward G. Bruck <[email protected]>
+// Copyright 2019 Edward G. Bruck <[email protected]>
 //
 // This file is part of Radiotray-NG.
 //

cmake/user-agent.cmake

@@ -11,7 +11,7 @@ else()
         set(USER_AGENT_DISTRO_CODENAME "El Capitan")
         execute_process(COMMAND sw_vers -productVersion OUTPUT_VARIABLE USER_AGENT_DISTRO_RELEASE  OUTPUT_STRIP_TRAILING_WHITESPACE)
     else()
-        message(FATAL_ERROR "lsb_release not found!")
+        message(AUTHOR_WARNING "lsb_release not found!")
     endif()
 endif()
 
@@ -27,10 +27,16 @@ if (NOT RTNG_GIT_VERSION)
     set(RTNG_GIT_VERSION "v${PROJECT_VERSION}-unknown")
 endif()
 
-set(RTNG_USER_AGENT "${CMAKE_PROJECT_NAME}/${PROJECT_VERSION} (${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR}; ${USER_AGENT_DISTRO}/${USER_AGENT_DISTRO_RELEASE} (${USER_AGENT_DISTRO_CODENAME}))")
+if (USER_AGENT_DISTRO AND USER_AGENT_DISTRO_RELEASE AND USER_AGENT_DISTRO_CODENAME)
+    set(RTNG_USER_AGENT "${CMAKE_PROJECT_NAME}/${PROJECT_VERSION} (${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR}; ${USER_AGENT_DISTRO}/${USER_AGENT_DISTRO_RELEASE} (${USER_AGENT_DISTRO_CODENAME}))")
+else()
+    set(RTNG_USER_AGENT "${CMAKE_PROJECT_NAME}/${PROJECT_VERSION} (${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR}; Uknown))")
+endif()
+
+
 configure_file(${PROJECT_SOURCE_DIR}/cmake/rtng_user_agent.hpp.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rtng_user_agent.hpp.tmp)
 
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rtng_user_agent.hpp.tmp ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rtng_user_agent.hpp)
 execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rtng_user_agent.hpp.tmp)
 
-#message(STATUS "user-agent: ${RTNG_USER_AGENT}")
+# message(STATUS "user-agent: ${RTNG_USER_AGENT}")

data/radiotray-ng.desktop

@@ -3,7 +3,7 @@ Categories=AudioVideo;Audio;Player;GTK;
 Comment=Internet Radio Player for Linux
 Exec=/usr/bin/radiotray-ng
 Hidden=false
-Icon=radiotray-ng-notification
+Icon=/usr/share/icons/hicolor/256x256/apps/radiotray-ng-notification.png
 Name=Radiotray-NG
 StartupNotify=false
 Terminal=false

data/rtng-bookmark-editor.desktop

@@ -3,7 +3,7 @@ Categories=AudioVideo;Audio;Player;GTK;
 Comment=Bookmark editor for Radiotray-NG
 Exec=/usr/bin/rtng-bookmark-editor
 Hidden=false
-Icon=radiotray-ng-notification
+Icon=/usr/share/icons/hicolor/256x256/apps/radiotray-ng-notification.png
 Name=Radiotray-NG Bookmark Editor
 StartupNotify=false
 Terminal=false