update audio_card_resource

canonical · Jul 18, 2023 · 6abcce0 · 6abcce0
1 parent 4114e22
commit 6abcce0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/providers/base/units/audio/jobs.pxu b/providers/base/units/audio/jobs.pxu
@@ -695,32 +695,18 @@ _summary: Check that at least one audio playback device exits
 plugin: shell
 category_id: com.canonical.plainbox::audio
 flags: also-after-suspend
-imports: from com.canonical.plainbox import manifest
 requires:
  audio_card.Playback == 'True'
-command:
- COUNT=$(alsa_pcm_info.py | grep -c Playback)
- echo "Count: $COUNT"
- if [ "$COUNT" -eq 0 ]; then
- exit 1
- fi
-estimated_duration: 1s
+estimated_duration: 0.5
 
 id: audio/detect-capture-devices
 _summary: Check that at least one audio capture device exists
 plugin: shell
 category_id: com.canonical.plainbox::audio
 flags: also-after-suspend
-imports: from com.canonical.plainbox import manifest
 requires:
  audio_card.Capture == 'True'
-command:
- COUNT=$(alsa_pcm_info.py | grep -c Capture)
- echo "Count: $COUNT"
- if [ "$COUNT" -eq 0 ]; then
- exit 1
- fi
-esimated_duration: 1s
+esimated_duration: 0.5
 
 id: audio/alsa-playback
 _summary: Playback works

diff --git a/providers/resource/bin/audio_card_resource.py b/providers/resource/bin/audio_card_resource.py
@@ -37,8 +37,8 @@ def get_audio_cards():
  'Card': card_id,
  'Device': device_id,
  'Name': device_name,
- 'Playback': any(cap.startswith('playback') for cap in capabilities),
- 'Capture': any(cap.startswith('capture') for cap in capabilities)
+ 'Playback': "supported" if any(cap.startswith('playback') for cap in capabilities) else "unsupported",
+ 'Capture': "supported" if any(cap.startswith('capture') for cap in capabilities) else "unsupported"
  })
  return audio_cards