Use existing device status objects (#221)

Author: evilhamsterman

http/types.go

@@ -12,38 +12,10 @@ type volumeResponse struct {
 }
 
 type statusResponse struct {
-	Info *cast.DeviceInfo `json:"info,omitempty"`
-
-	AppID        string `json:"app_id"`
-	DisplayName  string `json:"display_name"`
-	IsIdleScreen bool   `json:"is_idle_screen"`
-	StatusText   string `json:"status_text"`
-
-	PlayerState   string  `json:"player_state"`
-	CurrentTime   float32 `json:"current_time"`
-	IdleReason    string  `json:"idle_reason"`
-	CurrentItemID int     `json:"current_item_id"`
-	LoadingItemID int     `json:"loading_item_id"`
-
-	ContentID   string  `json:"content_id"`
-	ContentType string  `json:"content_type"`
-	StreamType  string  `json:"stream_type"`
-	Duration    float32 `json:"duration"`
-
-	Artist   string `json:"artist"`
-	Title    string `json:"title"`
-	Subtitle string `json:"subtitle"`
-
-	VolumeLevel      float32 `json:"volume_level"`
-	VolumeMuted      bool    `json:"volume_muted"`
-	MediaVolumeLevel float32 `json:"media_volume_level"`
-	MediaVolumeMuted bool    `json:"media_volume_muted"`
-
-	SessionID      string `json:"session_id"`
-	TransportID    string `json:"transport_id"`
-	MediaSessionID int    `json:"media_session_id"`
-
-	PlayerStateId int `json:"player_state_id"`
+	Info   *cast.DeviceInfo  `json:"info,omitempty"`
+	App    *cast.Application `json:"app,omitempty"`
+	Media  *cast.Media       `json:"media,omitempty"`
+	Volume *cast.Volume      `json:"volume,omitempty"`
 }
 
 func fromApplicationStatus(info *cast.DeviceInfo, app *cast.Application, media *cast.Media, volume *cast.Volume) statusResponse {
@@ -54,41 +26,15 @@ func fromApplicationStatus(info *cast.DeviceInfo, app *cast.Application, media *
 	}
 
 	if app != nil {
-		status.AppID = app.AppId
-		status.DisplayName = app.DisplayName
-		status.IsIdleScreen = app.IsIdleScreen
-		status.StatusText = app.StatusText
-		status.SessionID = app.SessionId
-		status.TransportID = app.TransportId
+		status.App = app
 	}
 
 	if media != nil {
-		status.PlayerState = media.PlayerState
-		status.CurrentTime = media.CurrentTime
-		status.IdleReason = media.IdleReason
-		status.CurrentItemID = media.CurrentItemId
-		status.LoadingItemID = media.LoadingItemId
-		status.MediaSessionID = media.MediaSessionId
-
-		status.MediaVolumeLevel = media.Volume.Level
-		status.MediaVolumeMuted = media.Volume.Muted
-
-		status.ContentID = media.Media.ContentId
-		status.ContentType = media.Media.ContentType
-		status.StreamType = media.Media.StreamType
-		status.Duration = media.Media.Duration
-
-		status.Artist = media.Media.Metadata.Artist
-		status.Title = media.Media.Metadata.Title
-		status.Subtitle = media.Media.Metadata.Subtitle
-
-		status.PlayerStateId = media.CustomData.PlayerState
-
+		status.Media = media
 	}
 
 	if volume != nil {
-		status.VolumeLevel = volume.Level
-		status.VolumeMuted = volume.Muted
+		status.Volume = volume
 	}
 
 	return status