Changed VLC again for sound_lib
This commit is contained in:
parent
1cd7d2ad39
commit
226a17b4fe
@ -1,6 +1,5 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
""" main controller for MusicDL"""
|
||||
from __future__ import unicode_literals # at top of module
|
||||
import types
|
||||
import webbrowser
|
||||
import wx
|
||||
@ -116,15 +115,15 @@ class Controller(object):
|
||||
elif ev.GetKeyCode() == wx.WXK_SPACE:
|
||||
return self.on_play_pause()
|
||||
elif ev.GetKeyCode() == wx.WXK_LEFT and ev.ShiftDown():
|
||||
position = player.player.player.get_time()
|
||||
position = player.player.player.get_position()
|
||||
if position > 5000:
|
||||
player.player.player.set_time(position-5000)
|
||||
player.player.player.set_position(position-5000)
|
||||
else:
|
||||
player.player.player.set_time(0)
|
||||
player.player.player.set_position(0)
|
||||
return
|
||||
elif ev.GetKeyCode() == wx.WXK_RIGHT and ev.ShiftDown():
|
||||
position = player.player.player.get_time()
|
||||
player.player.player.set_time(position+5000)
|
||||
position = player.player.player.get_position()
|
||||
player.player.player.set_position(position+5000)
|
||||
return
|
||||
elif ev.GetKeyCode() == wx.WXK_UP and ev.ControlDown():
|
||||
return self.on_volume_up()
|
||||
@ -206,11 +205,13 @@ class Controller(object):
|
||||
|
||||
def on_time_change(self, event, *args, **kwargs):
|
||||
p = event.GetPosition()
|
||||
if player.player.player != None:
|
||||
player.player.player.set_position(p/100.0)
|
||||
event.Skip()
|
||||
|
||||
def on_timer(self, *args, **kwargs):
|
||||
if not self.window.time_slider.HasFocus():
|
||||
if player.player.player != None:
|
||||
progress = player.player.player.get_position()*100
|
||||
self.window.time_slider.SetValue(progress)
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import os
|
||||
import random
|
||||
import vlc
|
||||
import logging
|
||||
import config
|
||||
import time
|
||||
from sound_lib import output, stream
|
||||
from pubsub import pub
|
||||
from utils import call_threaded
|
||||
from utils import call_threaded, RepeatingTimer
|
||||
|
||||
player = None
|
||||
log = logging.getLogger("controller.player")
|
||||
@ -26,35 +26,25 @@ class audioPlayer(object):
|
||||
self.stopped = True
|
||||
self.queue_pos = 0
|
||||
self.shuffle = False
|
||||
self.instance = vlc.Instance()
|
||||
log.debug("Instantiating Media player with the following information: VLC version detected={}. VLC bindings for python version{}".format(vlc.libvlc_get_version(), vlc.__version__))
|
||||
self.player = self.instance.media_player_new()
|
||||
log.debug("Media player instantiated.")
|
||||
self.event_manager = self.player.event_manager()
|
||||
self.event_manager.event_attach(vlc.EventType.MediaPlayerEndReached, self.end_callback)
|
||||
self.event_manager.event_attach(vlc.EventType.MediaPlayerEncounteredError, self.playback_error)
|
||||
log.debug("Bound media playback events.")
|
||||
# configure output device
|
||||
self.worker = RepeatingTimer(5, self.player_function)
|
||||
self.worker.start()
|
||||
self.output = output.Output()
|
||||
self.set_output_device(config.app["main"]["output_device"])
|
||||
self.player = None
|
||||
|
||||
def get_output_devices(self):
|
||||
""" Retrieve enabled output devices so we can switch or use those later. """
|
||||
log.debug("Retrieving output devices...")
|
||||
devices = []
|
||||
mods = self.player.audio_output_device_enum()
|
||||
if mods:
|
||||
mod = mods
|
||||
while mod:
|
||||
mod = mod.contents
|
||||
devices.append(dict(id=mod.device, name=mod.description))
|
||||
mod = mod.next
|
||||
vlc.libvlc_audio_output_device_list_release(mods)
|
||||
devices = output.Output.get_device_names()
|
||||
return devices
|
||||
|
||||
def set_output_device(self, device_id):
|
||||
def set_output_device(self, device_name):
|
||||
""" Set Output device to be used in LibVLC"""
|
||||
log.debug("Setting output audio device to {device}...".format(device=device_id,))
|
||||
self.player.audio_output_device_set(None, device_id)
|
||||
log.debug("Setting output audio device to {device}...".format(device=device_name,))
|
||||
try:
|
||||
self.output.set_device(self.output.find_device_by_name(device_name))
|
||||
except:
|
||||
log.error("Error in input or output devices, using defaults...")
|
||||
config.app["main"]["output_device"] = "Default"
|
||||
|
||||
def play(self, item):
|
||||
self.stopped = True
|
||||
@ -63,8 +53,7 @@ class audioPlayer(object):
|
||||
if item.download_url == "":
|
||||
item.get_download_url()
|
||||
log.debug("playing {0}...".format(item.download_url,))
|
||||
self.stream_new = self.instance.media_new(item.download_url)
|
||||
self.player.set_media(self.stream_new)
|
||||
self.player = stream.URLStream(item.download_url)
|
||||
if self.player.play() == -1:
|
||||
log.debug("Error when playing the file {0}".format(item.title,))
|
||||
pub.sendMessage("change_status", status=_("Error playing {0}. {1}.").format(item.title, e.description))
|
||||
@ -72,7 +61,7 @@ class audioPlayer(object):
|
||||
self.is_working = False
|
||||
self.next()
|
||||
return
|
||||
self.player.audio_set_volume(self.vol)
|
||||
self.player.volume = self.vol/100
|
||||
pub.sendMessage("change_status", status=_("Playing {0}.").format(item.title))
|
||||
self.stopped = False
|
||||
self.is_working = False
|
||||
@ -119,7 +108,8 @@ class audioPlayer(object):
|
||||
if vol <= 100 and vol >= 0:
|
||||
config.app["main"]["volume"] = vol
|
||||
self.vol = vol
|
||||
self.player.audio_set_volume(self.vol)
|
||||
if self.player != None:
|
||||
self.player.volume = self.vol/100
|
||||
|
||||
def play_all(self, list_of_items, playing=0, shuffle=False):
|
||||
if list_of_items != self.queue:
|
||||
@ -128,42 +118,19 @@ class audioPlayer(object):
|
||||
self.queue_pos = playing
|
||||
self.play(self.queue[self.queue_pos])
|
||||
|
||||
def end_callback(self, event, *args, **kwargs):
|
||||
#https://github.com/ZeBobo5/Vlc.DotNet/issues/4
|
||||
call_threaded(self.next)
|
||||
|
||||
def transcode_audio(self, item, path, _format="mp3", bitrate=320, metadata=dict()):
|
||||
""" Converts given item to mp3. This method will be available when needed automatically."""
|
||||
if item.download_url == "":
|
||||
item.get_download_url()
|
||||
log.debug("Download started: filename={0}, url={1}".format(path, item.download_url))
|
||||
temporary_filename = "chunk_{0}".format(random.randint(0,2000000))
|
||||
temporary_path = os.path.join(os.path.dirname(path), temporary_filename)
|
||||
# Let's get a new VLC instance for transcoding this file.
|
||||
transcoding_instance = vlc.Instance(*["--sout=#transcode{acodec=%s,ab=%d}:file{mux=raw,dst=\"%s\"}"% (_format, bitrate, temporary_path,)])
|
||||
transcoder = transcoding_instance.media_player_new()
|
||||
transcoder.set_mrl(item.download_url)
|
||||
pub.sendMessage("change_status", status=_(u"Downloading {0}.").format(item.title,))
|
||||
media = transcoder.get_media()
|
||||
transcoder.play()
|
||||
while True:
|
||||
state = media.get_state()
|
||||
pub.sendMessage("change_status", status=_("Downloading {0} ({1}%).").format(item.title, int(transcoder.get_position()*100)))
|
||||
pub.sendMessage("update-progress", value=int(transcoder.get_position()*100))
|
||||
if str(state) == 'State.Ended':
|
||||
break
|
||||
elif str(state) == 'state.error':
|
||||
os.remove(temporary_path)
|
||||
break
|
||||
transcoder.release()
|
||||
os.rename(temporary_path, path)
|
||||
log.debug("Download finished sucsessfully.")
|
||||
pub.sendMessage("download_finished", file=os.path.basename(path))
|
||||
def player_function(self):
|
||||
""" Check if the stream has reached the end of the file so it will play the next song. """
|
||||
if self.player != None and self.player.is_playing == False and self.stopped == False and len(self.player) == self.player.position:
|
||||
if self.queue_pos >= len(self.queue):
|
||||
self.stopped = True
|
||||
self.playing_all = False
|
||||
return
|
||||
elif self.playing_all == False:
|
||||
self.stopped = True
|
||||
return
|
||||
elif self.queue_pos < len(self.queue):
|
||||
self.queue_pos += 1
|
||||
self.play(self.queue[self.playing_track])
|
||||
|
||||
def playback_error(self, event):
|
||||
pub.sendMessage("notify", title=_("Error"), message=_("There was an error while trying to access the file you have requested."))
|
||||
|
||||
def __del__(self):
|
||||
self.event_manager.event_detach(vlc.EventType.MediaPlayerEndReached)
|
||||
if hasattr(self, "event_manager"):
|
||||
self.event_manager.event_detach(vlc.EventType.MediaPlayerEncounteredError, self.playback_error)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user