Use global config file in player classes

mps-youtube · Oct 27, 2019 · 955deaf · 955deaf
1 parent 3b479cb
commit 955deaf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/mps_youtube/players/mplayer.py b/mps_youtube/players/mplayer.py
@@ -13,15 +13,6 @@
 
 
 class mplayer(CmdPlayer):
-    DEFAULT_ARGS = {
-        "title": "-title",
-        "fs": "-fs",
-        "novid": "-novideo",
-        # "ignidx": "-lavfdopts o=fflags=+ignidx".split()
-        "ignidx": "",
-        "geo": "-geometry"
-    }
-
     def __init__(self, player):
         self.player = player
         self.mplayer_version = _get_mplayer_version(player)
@@ -42,7 +33,7 @@ def _generate_real_playerargs(self):
 
         args = config.PLAYERARGS.get.strip().split()
 
-        pd = self.DEFAULT_ARGS
+        pd = g.playerargs_defaults['mplayer']
         args.extend((pd["title"], '"{0}"'.format(self.song.title)))
 
         if pd['geo'] not in args:

diff --git a/mps_youtube/players/mpv.py b/mps_youtube/players/mpv.py
@@ -16,16 +16,6 @@
 
 
 class mpv(CmdPlayer):
-    DEFAULT_ARGS = {
-        "msglevel": {"<0.4": "--msglevel=all=no:statusline=status",
-                     ">=0.4": "--msg-level=all=no:statusline=status"},
-        "title": "--title",
-        "fs": "--fs",
-        "novid": "--no-video",
-        "ignidx": "--demuxer-lavf-o=fflags=+ignidx",
-        "geo": "--geometry"
-    }
-
     def __init__(self, player):
         self.player = player
         self.mpv_version = _get_mpv_version(player)
@@ -49,7 +39,7 @@ def _generate_real_playerargs(self):
 
         args = config.PLAYERARGS.get.strip().split()
 
-        pd = self.DEFAULT_ARGS
+        pd = g.playerargs_defaults['mpv']
         args.extend((pd["title"], '"{0}"'.format(self.song.title)))
 
         if pd['geo'] not in args:

diff --git a/mps_youtube/players/vlc.py b/mps_youtube/players/vlc.py
@@ -1,7 +1,7 @@
 import os
 import subprocess
 
-from .. import config, util
+from .. import config, util, g
 
 from ..player import CmdPlayer
 
@@ -13,6 +13,9 @@ def __init__(self, player):
     def _generate_real_playerargs(self):
         args = config.PLAYERARGS.get.strip().split()
 
+        pd = g.playerargs_defaults['vlc']
+        args.extend((pd["title"], '"{0}"'.format(self.song.title)))
+
         util.list_update("--play-and-exit", args)
 
         return [self.player] + args + [self.stream['url']]