From e6bc48ab68a08ff742708a76390c2a68592e9a97 Mon Sep 17 00:00:00 2001
From: Martin Hjelmare <marhje52@gmail.com>
Date: Wed, 9 Sep 2020 22:19:52 +0200
Subject: [PATCH] Remove media class apps and channels (#39864)

---
 homeassistant/components/media_player/const.py      |  2 --
 homeassistant/components/media_source/models.py     |  3 +--
 homeassistant/components/philips_js/media_player.py |  3 +--
 homeassistant/components/roku/media_player.py       | 10 ++++------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/homeassistant/components/media_player/const.py b/homeassistant/components/media_player/const.py
index 6714d03c19e..0035fc9f4d2 100644
--- a/homeassistant/components/media_player/const.py
+++ b/homeassistant/components/media_player/const.py
@@ -31,10 +31,8 @@ DOMAIN = "media_player"
 
 MEDIA_CLASS_ALBUM = "album"
 MEDIA_CLASS_APP = "app"
-MEDIA_CLASS_APPS = "apps"
 MEDIA_CLASS_ARTIST = "artist"
 MEDIA_CLASS_CHANNEL = "channel"
-MEDIA_CLASS_CHANNELS = "channels"
 MEDIA_CLASS_COMPOSER = "composer"
 MEDIA_CLASS_CONTRIBUTING_ARTIST = "contributing_artist"
 MEDIA_CLASS_DIRECTORY = "directory"
diff --git a/homeassistant/components/media_source/models.py b/homeassistant/components/media_source/models.py
index 5d768fd79d8..3b2044d7e0f 100644
--- a/homeassistant/components/media_source/models.py
+++ b/homeassistant/components/media_source/models.py
@@ -6,7 +6,6 @@ from typing import List, Optional, Tuple
 from homeassistant.components.media_player import BrowseMedia
 from homeassistant.components.media_player.const import (
     MEDIA_CLASS_CHANNEL,
-    MEDIA_CLASS_CHANNELS,
     MEDIA_TYPE_CHANNEL,
     MEDIA_TYPE_CHANNELS,
 )
@@ -54,7 +53,7 @@ class MediaSourceItem:
             base = BrowseMediaSource(
                 domain=None,
                 identifier=None,
-                media_class=MEDIA_CLASS_CHANNELS,
+                media_class=MEDIA_CLASS_CHANNEL,
                 media_content_type=MEDIA_TYPE_CHANNELS,
                 title="Media Sources",
                 can_play=False,
diff --git a/homeassistant/components/philips_js/media_player.py b/homeassistant/components/philips_js/media_player.py
index a780fe6b635..7da485fca74 100644
--- a/homeassistant/components/philips_js/media_player.py
+++ b/homeassistant/components/philips_js/media_player.py
@@ -12,7 +12,6 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.components.media_player.const import (
     MEDIA_CLASS_CHANNEL,
-    MEDIA_CLASS_CHANNELS,
     MEDIA_TYPE_CHANNEL,
     MEDIA_TYPE_CHANNELS,
     SUPPORT_BROWSE_MEDIA,
@@ -290,7 +289,7 @@ class PhilipsTVMediaPlayer(MediaPlayerEntity):
 
         return BrowseMedia(
             title="Channels",
-            media_class=MEDIA_CLASS_CHANNELS,
+            media_class=MEDIA_CLASS_CHANNEL,
             media_content_id="",
             media_content_type=MEDIA_TYPE_CHANNELS,
             can_play=False,
diff --git a/homeassistant/components/roku/media_player.py b/homeassistant/components/roku/media_player.py
index 7935206f114..3438b8c7add 100644
--- a/homeassistant/components/roku/media_player.py
+++ b/homeassistant/components/roku/media_player.py
@@ -12,9 +12,7 @@ from homeassistant.components.media_player import (
 )
 from homeassistant.components.media_player.const import (
     MEDIA_CLASS_APP,
-    MEDIA_CLASS_APPS,
     MEDIA_CLASS_CHANNEL,
-    MEDIA_CLASS_CHANNELS,
     MEDIA_CLASS_DIRECTORY,
     MEDIA_TYPE_APP,
     MEDIA_TYPE_APPS,
@@ -95,7 +93,7 @@ def browse_media_library(channels: bool = False) -> BrowseMedia:
     library_info.children.append(
         BrowseMedia(
             title="Apps",
-            media_class=MEDIA_CLASS_APPS,
+            media_class=MEDIA_CLASS_APP,
             media_content_id="apps",
             media_content_type=MEDIA_TYPE_APPS,
             can_expand=True,
@@ -107,7 +105,7 @@ def browse_media_library(channels: bool = False) -> BrowseMedia:
         library_info.children.append(
             BrowseMedia(
                 title="Channels",
-                media_class=MEDIA_CLASS_CHANNELS,
+                media_class=MEDIA_CLASS_CHANNEL,
                 media_content_id="channels",
                 media_content_type=MEDIA_TYPE_CHANNELS,
                 can_expand=True,
@@ -294,7 +292,7 @@ class RokuMediaPlayer(RokuEntity, MediaPlayerEntity):
         if media_content_type == MEDIA_TYPE_APPS:
             response = BrowseMedia(
                 title="Apps",
-                media_class=MEDIA_CLASS_APPS,
+                media_class=MEDIA_CLASS_APP,
                 media_content_id="apps",
                 media_content_type=MEDIA_TYPE_APPS,
                 can_expand=True,
@@ -316,7 +314,7 @@ class RokuMediaPlayer(RokuEntity, MediaPlayerEntity):
         if media_content_type == MEDIA_TYPE_CHANNELS:
             response = BrowseMedia(
                 title="Channels",
-                media_class=MEDIA_CLASS_CHANNELS,
+                media_class=MEDIA_CLASS_CHANNEL,
                 media_content_id="channels",
                 media_content_type=MEDIA_TYPE_CHANNELS,
                 can_expand=True,