common/types: move stuff from requests to types

src/commands/controlling_playback/seekcur.rs

@@ -3,8 +3,7 @@ use crate::{
         Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
         ResponseParserError,
     },
-    common::TimeWithFractions,
-    request::SeekMode,
+    common::{SeekMode, TimeWithFractions},
 };
 
 pub struct SeekCur;

src/commands/playback_options/getvol.rs

@@ -1,6 +1,11 @@
+use std::collections::HashMap;
+
 use crate::{
-    commands::{Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError},
-    request::VolumeValue,
+    commands::{
+        get_and_parse_property, Command, Request, RequestParserResult, ResponseAttributes,
+        ResponseParserError,
+    },
+    common::VolumeValue,
 };
 
 pub struct GetVol;
@@ -15,15 +20,11 @@ impl Command for GetVol {
     }
 
     fn parse_response(
-        _parts: ResponseAttributes<'_>,
+        parts: ResponseAttributes<'_>,
     ) -> Result<Self::Response, ResponseParserError> {
-        unimplemented!()
-        // let volume = get_property!(parts, Volume, "volume");
-        // let volume = match parts.get("volume") {
-        //     Some(GenericResponseValue::Volume(v)) => *v,
-        //     _ => return Err(ResponseParserError::MissingField("volume")),
-        // };
-
-        // Ok(volume)
+        let parts: HashMap<_, _> = parts.into();
+        assert_eq!(parts.len(), 1);
+        let volume = get_and_parse_property!(parts, "volume", Text);
+        Ok(volume)
     }
 }

src/commands/playback_options/replay_gain_mode.rs

@@ -5,7 +5,7 @@ use crate::{
         Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
         ResponseParserError,
     },
-    request::ReplayGainModeMode,
+    common::ReplayGainModeMode,
 };
 
 pub struct ReplayGainMode;

src/commands/playback_options/replay_gain_status.rs

@@ -7,7 +7,7 @@ use crate::{
         get_property, Command, Request, RequestParserResult, ResponseAttributes,
         ResponseParserError,
     },
-    request::ReplayGainModeMode,
+    common::ReplayGainModeMode,
 };
 
 pub struct ReplayGainStatus;

src/commands/playback_options/setvol.rs

@@ -5,7 +5,7 @@ use crate::{
         Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
         ResponseParserError,
     },
-    request::VolumeValue,
+    common::VolumeValue,
 };
 
 pub struct SetVol;

src/commands/playback_options/volume.rs

@@ -5,7 +5,7 @@ use crate::{
         Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
         ResponseParserError,
     },
-    request::VolumeValue,
+    common::VolumeValue,
 };
 
 pub struct Volume;