cplay/patches/fixes2.patch

   1 --- a/cplay
   2 +++ b/cplay
   3 @@ -1542,7 +1542,7 @@
   4
   5
   6  class FrameOffsetPlayer(Player):
   7 -    re_progress = re.compile(br'Time.*\s(\d+):(\d+).*\[(\d+):(\d+)')
   8 +    re_progress = re.compile(br'(?:Time|\>).*\s(\d+):(\d+).*(?:\+|\[)(\d+):(\d+)')
   9
  10      def parse_buf(self):
  11          match = self.re_progress.search(self.buf)
  12 @@ -1944,19 +1944,19 @@
  13          traceback.print_exc()
  14
  15
  16 -MIXERS = [PulseMixer, AlsaMixer, OssMixer]
  17 +MIXERS = []
  18  PLAYERS = [
  19 -    FrameOffsetPlayer('ogg123 -q -v -k %d %s',
  20 +    FrameOffsetPlayer('ogg123 -q -v -d alsa -o dev:front:CARD=XFi,DEV=0 -k %d %s',
  21              r'\.ogg$'),
  22      FrameOffsetPlayer('splay -f -k %d %s',
  23              r'(^https?://|\.mp[123]$)', 38.28),
  24 -    FrameOffsetPlayer('mpg123 -q -v -k %d %s',
  25 +    FrameOffsetPlayer('mpg123 -q -v -a front:CARD=XFi,DEV=0 -k %d %s',
  26              r'(^https?://|\.mp[123]$)', 38.28),
  27      FrameOffsetPlayer('mpg321 -q -v -k %d %s',
  28              r'(^https?://|\.mp[123]$)', 38.28),
  29      TimeOffsetPlayer('madplay -v --display-time=remaining -s %d %s',
  30              r'\.mp[123]$'),
  31 -    MPV('mpv --audio-display=no --start %d %s',
  32 +    MPV('mpv --osd-fractions=no --audio-display=no --audio-device=alsa/front:CARD=XFi,DEV=0 %s',
  33              r'^https?://|\.(mp[123cp+]|ogg|flac|spx|cdr|wav|aiff|ape|m4a|wma'
  34              r'|mod|xm|fm|s3m|med|col|669|it|mtm|stm|au)$'),
  35      # raw FLAC workaround.
  36 @@ -1967,7 +1967,7 @@
  37              r'|mod|xm|fm|s3m|med|col|669|it|mtm|stm|au)$'),
  38      GSTPlayer('gst123 -x -k %d %s',
  39              r'\.(mp[123]|ogg|opus|oga|flac|wav|m4a|m4b|aiff)$'),
  40 -    FFPlay('ffplay -nodisp -autoexit -ss %d %s',
  41 +    FFPlay('ffplay -loglevel -8 -stats -nodisp -autoexit -ss %d %s',
  42             r'^https?://|\.(mp[123]|ogg|opus|oga|flac|wav|m4a|m4b|aiff)$'),
  43      FFPlay('avplay -nodisp -autoexit -ss %d %s',
  44             r'^https?://|\.(mp[123]|ogg|opus|oga|flac|wav|m4a|m4b|aiff)$'),