0x2620/pandora_p_for_power
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: 0x2620:b820abed7fcd607eb793a8c21db63817bd1c78b7
Branches Tags
0x2620:main
...
compare: 0x2620:b173025dc0f2dc7a65551de2f678846c81ed24c6
Branches Tags
0x2620:main

2 commits
b820abed7f ... b173025dc0

Author SHA1 Message Date
j
b173025dc0 sound mix 2026-01-24 20:44:48 +01:00
j
ab45117ab0 tweak player 2026-01-24 20:44:35 +01:00
2 changed files with 15 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

25
player/player.py
View file

@ -71,8 +71,9 @@ class Sync(Thread):
if kwargs.get("music"): if kwargs.get("music"):
music = mpv.MPV( music = mpv.MPV(
log_handler=mpv_log, input_default_bindings=True, log_handler=mpv_log,
input_vo_keyboard=True, input_default_bindings=False,
input_vo_keyboard=False,
) )
music.loop_file = True music.loop_file = True
music.play("/srv/p_for_power/render/music-5.1.mp4") music.play("/srv/p_for_power/render/music-5.1.mp4")
@ -80,15 +81,17 @@ class Sync(Thread):
if kwargs.get("forest"): if kwargs.get("forest"):
forest = mpv.MPV( forest = mpv.MPV(
log_handler=mpv_log, input_default_bindings=True, log_handler=mpv_log,
input_vo_keyboard=True, input_default_bindings=False,
input_vo_keyboard=False,
) )
forest.loop_file = True forest.loop_file = True
forest.play("/srv/p_for_power/render/forest-5.1.mp4") forest.play("/srv/p_for_power/render/forest-5.1.mp4")
self.loops.append(forest) self.loops.append(forest)
self.mpv = mpv.MPV( self.mpv = mpv.MPV(
log_handler=mpv_log, input_default_bindings=True, log_handler=mpv_log,
input_default_bindings=True,
input_vo_keyboard=True, input_vo_keyboard=True,
sub_font_size=CONFIG["font_size"], sub_font=CONFIG["font"], sub_font_size=CONFIG["font_size"], sub_font=CONFIG["font"],
sub_border_size=CONFIG["font_border"], sub_border_size=CONFIG["font_border"],
@ -165,13 +168,13 @@ class Sync(Thread):
self.mpv.stop() self.mpv.stop()
def q_binding(self, *args): def q_binding(self, *args):
if args[0] != 'd-': if args and args[0] and args[0][0] != 'd':
return return
self.stop() self.stop()
self.mpv.stop() self.mpv.stop()
def space_binding(self, *args): def space_binding(self, *args):
if args[0] != 'd-': if args and args[0] and args[0][0] != 'd':
return return
if self.mpv.pause: if self.mpv.pause:
self.p_binding(*args) self.p_binding(*args)
@ -179,7 +182,7 @@ class Sync(Thread):
self.s_binding(*args) self.s_binding(*args)
def s_binding(self, *args): def s_binding(self, *args):
if args[0] != 'd-': if args and args[0] and args[0][0] != 'd':
return return
self.is_paused = True self.is_paused = True
self.mpv.pause = True self.mpv.pause = True
@ -188,7 +191,7 @@ class Sync(Thread):
self.send_playback_state() self.send_playback_state()
def p_binding(self, *args): def p_binding(self, *args):
if args[0] != 'd-': if args and args[0] and args[0][0] != 'd':
return return
self.is_paused = False self.is_paused = False
self._tick = 0 self._tick = 0
@ -412,8 +415,8 @@ def main():
parser.add_argument('--window', action='store_true', help='run in window', default=False) parser.add_argument('--window', action='store_true', help='run in window', default=False)
parser.add_argument('--debug', action='store_true', help='debug', default=False) parser.add_argument('--debug', action='store_true', help='debug', default=False)
parser.add_argument('--hour', action='store_true', help='hour', default=False) parser.add_argument('--hour', action='store_true', help='hour', default=False)
parser.add_argument('--no-forest', action='store_false', help='disable background forest loop', default=True) parser.add_argument('--no-forest', action='store_false', help='disable background forest loop', default=False)
parser.add_argument('--no-music', action='store_false', help='disable background music loop', default=True) parser.add_argument('--no-music', action='store_false', help='disable background music loop', default=False)
parser.add_argument('--config', help='config', default=None) parser.add_argument('--config', help='config', default=None)
args = parser.parse_args() args = parser.parse_args()

22
render.py
View file

@ -174,7 +174,7 @@ def compose(clips, fragment, target=150, base=1024, voice_over=None, options=Non
["channels", "2"], ["channels", "2"],
], ],
'loudness': [ 'loudness': [
["program", "-27"], ["program", "-17"],
["results", clip["loudnorm"]], ["results", clip["loudnorm"]],
], ],
'volume': volume_front, 'volume': volume_front,
@ -240,28 +240,8 @@ def compose(clips, fragment, target=150, base=1024, voice_over=None, options=Non
voice_overs.append(vo) voice_overs.append(vo)
voc = vo.copy() voc = vo.copy()
a, b = '-11', '-3' a, b = '-11', '-3'
if 'Whispered' in voc['src']:
a, b = '-8', '0'
elif 'Read' in voc['src']:
a, b = '-7.75', '0.25'
elif 'Free' in voc['src']:
a, b = '-8.8', '-0.8'
elif 'Ashley' in voc['src']:
a, b = '-9.5', '-1.50'
elif 'Melody' in voc['src']:
a, b = '-5.25', '-0.25'
if options.get('stereo_downmix'): if options.get('stereo_downmix'):
a, b = '-9', '-1' a, b = '-9', '-1'
if 'Whispered' in voc['src']:
a, b = '-6', '2'
elif 'Read' in voc['src']:
a, b = '-5.75', '2.25'
elif 'Free' in voc['src']:
a, b = '-6.8', '3.2'
elif 'Ashley' in voc['src']:
a, b = '-7.5', '0.50'
elif 'Melody' in voc['src']:
a, b = '-3.25', '1.75'
voc['filter'] = {'volume': a} voc['filter'] = {'volume': a}
scene['audio-center']['A1'].append(voc) scene['audio-center']['A1'].append(voc)
vo_low = vo.copy() vo_low = vo.copy()