Merge remote-tracking branch 'origin/v2.5' into snappy

janbar · Feb 19, 2018 · 6df2254 · 6df2254
2 parents 6c37a87 + 48739cf
commit 6df2254
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 679 deletions.
diff --git a/app/main.qml b/app/main.qml
@@ -208,7 +208,6 @@ MainView {
         AllAlbumsModel.init(Sonos, "",      false);
         AllArtistsModel.init(Sonos, "",     false);
         AllGenresModel.init(Sonos, "",      false);
-        AllRadiosModel.init(Sonos, "R:0/0", false);
         AllPlaylistsModel.init(Sonos, "",   false);
         MyServicesModel.init(Sonos,         false);
 
@@ -314,12 +313,6 @@ MainView {
         onLoaded: MyServicesModel.resetModel()
     }
 
-    Connections {
-        target: AllRadiosModel
-        onDataUpdated: AllRadiosModel.asyncLoad()
-        onLoaded: AllRadiosModel.resetModel()
-    }
-
     Connections {
         target: AllFavoritesModel
         onDataUpdated: AllFavoritesModel.asyncLoad()
@@ -920,12 +913,6 @@ MainView {
                     onTriggered: tabs.selectedTabIndex = genresTab.index
                     visible: AllGenresModel.count > 0 ? true : false
                 },
-                Action {
-                    objectName: "radiosTabAction"
-                    text: radiosTab.title
-                    onTriggered: tabs.selectedTabIndex = radiosTab.index
-                    visible: AllRadiosModel.count > 0 ? true : false
-                },
                 Action {
                     objectName: "playlistsTabAction"
                     text: playlistsTab.title
@@ -998,18 +985,6 @@ MainView {
                 }
             }
 
-            Tab {
-                id: radiosTab
-                objectName: "radiosTab"
-                anchors.fill: parent
-                title: page.pageTitle
-
-                // Tab content begins here
-                page: Radios {
-                    id: radiosPage
-                }
-            }
-
             Tab {
                 id: playlistsTab
                 objectName: "playlistsTab"

diff --git a/app/noson.qrc b/app/noson.qrc
@@ -27,7 +27,6 @@
         <file>ui/MusicServices.qml</file>
         <file>ui/Favorites.qml</file>
         <file>ui/Service.qml</file>
-        <file>ui/Radios.qml</file>
         <file>components/ServiceRegistration.qml</file>
         <file>components/ServiceLogin.qml</file>
         <file>components/Delegates/MusicListItem.qml</file>

diff --git a/app/ui/Radios.qml b/app/ui/Radios.qml
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
@@ -37,8 +37,6 @@ set(
     modules/NosonApp/tracksmodel.h
     modules/NosonApp/queuemodel.cpp
     modules/NosonApp/queuemodel.h
-    modules/NosonApp/radiosmodel.cpp
-    modules/NosonApp/radiosmodel.h
     modules/NosonApp/playlistsmodel.cpp
     modules/NosonApp/playlistsmodel.h
     modules/NosonApp/zonesmodel.cpp

diff --git a/backend/modules/NosonApp/backend.cpp b/backend/modules/NosonApp/backend.cpp
@@ -36,7 +36,6 @@ void BackendPlugin::registerTypes(const char *uri)
   qmlRegisterSingletonType<AlbumsModel>(uri, 1, 0, "AllAlbumsModel", Sonos::allAlbumsModel_provider);
   qmlRegisterSingletonType<ArtistsModel>(uri, 1, 0, "AllArtistsModel", Sonos::allArtistsModel_provider);
   qmlRegisterSingletonType<GenresModel>(uri, 1, 0, "AllGenresModel", Sonos::allGenresModel_provider);
-  qmlRegisterSingletonType<RadiosModel>(uri, 1, 0, "AllRadiosModel", Sonos::allRadiosModel_provider);
   qmlRegisterSingletonType<PlaylistsModel>(uri, 1, 0, "AllPlaylistsModel", Sonos::allPlaylistsModel_provider);
   qmlRegisterSingletonType<FavoritesModel>(uri, 1, 0, "AllFavoritesModel", Sonos::allFavoritesModel_provider);
   qmlRegisterSingletonType<ServicesModel>(uri, 1, 0, "MyServicesModel", Sonos::MyServicesModel_provider);
@@ -50,7 +49,6 @@ void BackendPlugin::registerTypes(const char *uri)
   qmlRegisterType<AlbumsModel>(uri, 1, 0, "AlbumsModel");
   qmlRegisterType<ArtistsModel>(uri, 1, 0, "ArtistsModel");
   qmlRegisterType<GenresModel>(uri, 1, 0, "GenresModel");
-  qmlRegisterType<RadiosModel>(uri, 1, 0, "RadiosModel");
   qmlRegisterType<PlaylistsModel>(uri, 1, 0, "PlaylistsModel");
   qmlRegisterType<TracksModel>(uri, 1, 0, "TracksModel");
   qmlRegisterType<QueueModel>(uri, 1, 0, "QueueModel");