Skip to content
This repository has been archived by the owner on Jun 30, 2019. It is now read-only.

Commit

Permalink
Merge f993211 into 9bee3d3
Browse files Browse the repository at this point in the history
  • Loading branch information
cosven authored Jul 30, 2018
2 parents 9bee3d3 + f993211 commit 4ceb8fe
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 4 deletions.
34 changes: 32 additions & 2 deletions fuocore/main.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
"""
main.py
~~~~~~~
基于 fuocore 提供的模块和功能,写的一个 DEMO 应用。
"""

import argparse
import asyncio
import logging
import sys
Expand Down Expand Up @@ -67,11 +75,33 @@ def setup_logger(debug=True):
logging.config.dictConfig(dict_config)


def setup_argparse():
parser = argparse.ArgumentParser(description='运行 fuo 播放服务')
parser.add_argument('-d', '--debug', action='store_true', default=False,
help='开启调试模式')

# XXX: 不知道能否加一个基于 regex 的 option?比如加一个
# `--mpv-*` 的 option,否则每个 mpv 配置我都需要写一个 option?

# TODO: 需要在文档中给出如何查看有哪些播放设备的方法
parser.add_argument(
'--mpv-audio-device',
default='auto',
help='(高级选项)给 mpv 播放器指定播放设备'
)
return parser


def main():
debug = '-d' in sys.argv
parser = setup_argparse()
args = parser.parse_args()

debug = args.debug
mpv_audio_device = args.mpv_audio_device

setup_logger(debug=debug)

player = MpvPlayer()
player = MpvPlayer(audio_device=bytes(mpv_audio_device, 'utf-8'))
player.initialize()
library = Library()
library.register(lp)
Expand Down
8 changes: 6 additions & 2 deletions fuocore/player.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
import logging
import random

from mpv import MPV, MpvEventID, MpvEventEndFile
from mpv import MPV, MpvEventID, MpvEventEndFile, \
_mpv_set_property_string

from fuocore.dispatch import Signal

Expand Down Expand Up @@ -292,11 +293,14 @@ class MpvPlayer(AbstractPlayer):
TODO: make me singleton
"""
def __init__(self):
def __init__(self, audio_device=b'auto', *args, **kwargs):
super(MpvPlayer, self).__init__()
self._mpv = MPV(ytdl=False,
input_default_bindings=True,
input_vo_keyboard=True)

_mpv_set_property_string(self._mpv.handle, b'audio-device', audio_device)

self._playlist = Playlist()
self._playlist.song_changed.connect(self._on_song_changed)

Expand Down

0 comments on commit 4ceb8fe

Please sign in to comment.