Skip to content

Commit

Permalink
Merge pull request #154 from OpenVoiceOS/release-1.1.6a1
Browse files Browse the repository at this point in the history
Release 1.1.6a1
  • Loading branch information
JarbasAl authored Nov 15, 2024
2 parents 41687b1 + 0109a28 commit 11ca611
Show file tree
Hide file tree
Showing 90 changed files with 17 additions and 42 deletions.
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Changelog

## [1.1.5a1](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/1.1.5a1) (2024-11-06)
## [1.1.6a1](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/1.1.6a1) (2024-11-15)

[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V1.1.4...1.1.5a1)
[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V1.1.5...1.1.6a1)

**Merged pull requests:**

- fix: allow latest bus client version [\#150](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/150) ([JarbasAl](https://github.com/JarbasAl))
- fix:homescreen app [\#152](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/152) ([JarbasAl](https://github.com/JarbasAl))

## [V1.1.4](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V1.1.4) (2024-10-31)
## [V1.1.5](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V1.1.5) (2024-11-06)

[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/1.1.4...V1.1.4)
[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/1.1.5...V1.1.5)



Expand Down
21 changes: 7 additions & 14 deletions ovos_plugin_common_play/ocp/__init__.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
import time
from os.path import join, dirname, isfile
from threading import Event, Lock
from os.path import join, dirname
from typing import Optional, List
from ovos_config import Configuration
from ovos_plugin_common_play.ocp.gui import OCPMediaPlayerGUI
from ovos_plugin_common_play.ocp.player import OCPMediaPlayer
from ovos_utils.gui import can_use_gui

from ovos_plugin_manager.ocp import load_stream_extractors
from ovos_utils.log import LOG
from ovos_utils.messagebus import Message

from padacioso import IntentContainer

from ovos_workshop.app import OVOSAbstractApplication
from ovos_workshop.decorators.ocp import *
from ovos_plugin_manager.ocp import load_stream_extractors
from ovos_workshop.decorators import homescreen_app

from ovos_plugin_common_play.ocp.constants import OCP_ID
from ovos_plugin_common_play.ocp.gui import OCPMediaPlayerGUI
from ovos_plugin_common_play.ocp.player import OCPMediaPlayer


class OCP(OVOSAbstractApplication):
Expand Down Expand Up @@ -79,14 +73,13 @@ def handle_get_SEIs(self, message):
xtract = load_stream_extractors() # @lru_cache, its a lazy loaded singleton
self.bus.emit(message.response({"SEI": xtract.supported_seis}))

@homescreen_app(icon="OCP.png", name="OCP")
def handle_home(self, message=None):
"""
Handle ovos.common_play.home Messages and show the homescreen
@param message: message associated with request
"""
# homescreen / launch from .desktop
self.gui.show_home(app_mode=True)

def default_shutdown(self):
self.player.shutdown()

2 changes: 1 addition & 1 deletion ovos_plugin_common_play/ocp/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def __init__(self, bus=None):
# the skill_id is chosen so the namespace matches the regular bus api
# ie, the gui event "XXX" is sent in the bus as "ovos.common_play.XXX"
gui_config = Configuration().get("gui") or {}
ui_dirs = {"qt5": f"{dirname(__file__)}/res/ui"}
ui_dirs = {"qt5": f"{dirname(__file__)}/res/gui/qt5"}
super(OCPMediaPlayerGUI, self).__init__(bus=bus,
skill_id=OCP_ID,
ui_directories=ui_dirs,
Expand Down
18 changes: 0 additions & 18 deletions ovos_plugin_common_play/ocp/res/desktop/OCP.desktop

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions ovos_plugin_common_play/version.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# START_VERSION_BLOCK
VERSION_MAJOR = 1
VERSION_MINOR = 1
VERSION_BUILD = 5
VERSION_ALPHA = 0
VERSION_BUILD = 6
VERSION_ALPHA = 1
# END_VERSION_BLOCK
2 changes: 1 addition & 1 deletion requirements/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ovos-plugin-manager>=0.0.26,<1.0.0
ovos_bus_client>=0.0.7,<2.0.0
ovos-utils>=0.1.0,<1.0.0
ovos-workshop>=0.0.16,<3.0.0
ovos-workshop>=2.4.2,<3.0.0
padacioso>=0.1.1,<2.0.0
dbus-next
2 changes: 1 addition & 1 deletion test/unittests/test_ocp_player.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def test_00_player_init(self):
from ovos_plugin_common_play.ocp.media import NowPlaying, Playlist
from ovos_plugin_common_play.ocp.mpris import MprisPlayerCtl
from ovos_bus_client.apis.ocp import ClassicAudioServiceInterface
from ovos_workshop import OVOSAbstractApplication
from ovos_workshop.app import OVOSAbstractApplication

self.assertIsInstance(self.player, OVOSAbstractApplication)
self.assertIsInstance(self.player.gui, OCPMediaPlayerGUI)
Expand Down

0 comments on commit 11ca611

Please sign in to comment.