Skip to content

Commit 01e8e32

Browse files
s-n-gs-n-g
committed
- fixing mplayer caching (removing =)
- removing debug log messages
1 parent 6934080 commit 01e8e32

File tree

6 files changed

+38
-46
lines changed

6 files changed

+38
-46
lines changed

‎pyradio/config.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2485,17 +2485,17 @@ def save_config(self, from_command_line=False):
24852485
# logger.error('\n\n{}\n\n'.format(self.saved_params))
24862486
cfgfile.write(txt.format(a_set))
24872487
for i, a_param in enumerate(self.saved_params[a_set]):
2488-
logger.info('set: {0} - i = {1}, param = "{2}"'.format(a_set, i , a_param))
2488+
# logger.info('set: {0} - i = {1}, param = "{2}"'.format(a_set, i , a_param))
24892489
if i == 0:
24902490
default = a_param
24912491
elif i > 1:
24922492
if i == default:
24932493
txt = '*' + a_param
24942494
cfgfile.write('{}\n'.format(a_set + '_parameter=' + txt))
2495-
logger.info('i= {0} == default : txt = "{1}"'.format(i, txt))
2495+
# logger.info('i= {0} == default : txt = "{1}"'.format(i, txt))
24962496
else:
24972497
if not a_param.startswith('profile:'):
2498-
logger.info('i= {0} != default : txt = "{1}"'.format(i, a_param))
2498+
# logger.info('i= {0} != default : txt = "{1}"'.format(i, a_param))
24992499
cfgfile.write('{}\n'.format(a_set + '_parameter=' + a_param))
25002500

25012501
except:

‎pyradio/config_window.py‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,6 @@ def keypress(self, char):
889889
elif sel == 'force_transparency':
890890
#self._old_use_transparency = not self._config_options[ 'use_transparency' ][1]
891891
self._config_options['force_transparency'][1] = not self._config_options['force_transparency'][1]
892-
logger.info('|||| Launching self._update_transparency_function')
893892
self._update_transparency_function(
894893
changed_from_config_window=True,
895894
calculate_transparency_function=self.calculate_transparency
@@ -1320,7 +1319,6 @@ def __init__(self,
13201319
entry_cannot_be_deleted_function=None,
13211320
global_functions=None):
13221321
self._list = None
1323-
logger.error('player = {}'.format(player))
13241322
self._cnf = config
13251323
self._orig_params = deepcopy(self._cnf.params)
13261324
self._global_functions = set_global_functions(global_functions)
@@ -1757,8 +1755,8 @@ def _get_color(self, a_line):
17571755

17581756
def set_player(self, a_player, from_keypress=False):
17591757
if a_player in self._cnf.SUPPORTED_PLAYERS:
1760-
logger.error('\n>>>==========')
1761-
# logger.error('self._selections = {}'.format(self._selections))
1758+
# logger.error('\n>>>==========')
1759+
# # logger.error('self._selections = {}'.format(self._selections))
17621760
if self._list and from_keypress:
17631761
self._update_items_dict()
17641762
self._orig_player = self._player
@@ -1769,11 +1767,11 @@ def set_player(self, a_player, from_keypress=False):
17691767
self._list.selection = self._selections[self._player][0]
17701768
self._list._start_pos = self._selections[self._player][1]
17711769
self._list.active = self._selections[self._player][2]
1772-
logger.error('self._items_dict = {}'.format(self._items_dict))
1773-
logger.error('a_player = {}'.format(a_player))
1774-
# logger.error('self._items = {}'.format(self._items))
1775-
# logger.error('self._selections = {}'.format(self._selections))
1776-
logger.error('\n<<<==========')
1770+
# logger.error('self._items_dict = {}'.format(self._items_dict))
1771+
# logger.error('a_player = {}'.format(a_player))
1772+
# # logger.error('self._items = {}'.format(self._items))
1773+
# # logger.error('self._selections = {}'.format(self._selections))
1774+
# logger.error('\n<<<==========')
17771775
if logger.isEnabledFor(logging.DEBUG):
17781776
logger.debug('changing player to "{0}", loading times items: {1}'.format(self._player, self._items))
17791777
self.refresh_win()
@@ -2143,7 +2141,6 @@ def keypress(self, char):
21432141
return 1
21442142

21452143
elif char == ord('r'):
2146-
logger.error('\n\n************\n\n')
21472144
self.reset()
21482145

21492146
elif char == ord('s'):

‎pyradio/log.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def write(self,
119119
help_msg=False,
120120
error_msg=False,
121121
notify_function=None):
122-
logger.error('**** Log.write: msg = "{}"'.format(msg))
122+
# logger.error('**** Log.write: msg = "{}"'.format(msg))
123123
if self.cursesScreen:
124124
with self.lock:
125125
if msg:
@@ -175,7 +175,7 @@ def write(self,
175175
self._player_stopped = 0
176176
return
177177
''' update main message '''
178-
logger.error('*** msg = "{}"'.format(msg))
178+
# logger.error('*** msg = "{}"'.format(msg))
179179
if self.msg:
180180
self.cursesScreen.erase()
181181
d_msg = ''

‎pyradio/player.py‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,8 @@ def recording(self, val):
359359
logger.error('\n\nsetting recording to {}'.format(self._recording))
360360

361361
def _player_is_buffering(self, opts, tokens):
362-
logger.error('opts = {}'.format(opts))
363-
logger.error('tokens = {}'.format(tokens))
362+
# logger.error('opts = {}'.format(opts))
363+
# logger.error('tokens = {}'.format(tokens))
364364
for k in tokens:
365365
for n in opts:
366366
if k in n:
@@ -1007,13 +1007,13 @@ def updateStatus(self, *args):
10071007
if (logger.isEnabledFor(logging.INFO)):
10081008
logger.info('Icy-Title is NOT valid')
10091009
if ok_to_display and self.playback_is_on:
1010-
logger.error('\n\nhere - self.buffering: {}'.format(self.buffering))
1010+
# logger.error('\n\nhere - self.buffering: {}'.format(self.buffering))
10111011
if self.buffering:
10121012
title = 'Buffering: ' + self.name
1013-
logger.error('buffering')
1013+
# logger.error('buffering')
10141014
else:
10151015
title = 'Playing: ' + self.name
1016-
logger.error('playing')
1016+
# logger.error('playing')
10171017
self.oldUserInput['Title'] = title
10181018
string_to_show = self.title_prefix + title
10191019
self.outputStream.write(msg=string_to_show, counter='')
@@ -1242,11 +1242,11 @@ def updateMPVStatus(self, *args):
12421242
if stop():
12431243
break
12441244
d = json.loads(n)
1245-
logger.error('d = {}'.format(d))
1245+
# logger.error('d = {}'.format(d))
12461246
if 'event' in d.keys():
12471247
# logger.info('metadata-update\n\n')
12481248
if d['event'] == 'metadata-update':
1249-
logger.info('{}\n\n'.format(d['event']))
1249+
# logger.info('{}\n\n'.format(d['event']))
12501250
try:
12511251
if platform.startswith('win'):
12521252
win32file.WriteFile(sock, self.GET_TITLE)
@@ -1260,8 +1260,8 @@ def updateMPVStatus(self, *args):
12601260
self._request_mpv_info_data(sock)
12611261
self.info_display_handler()
12621262
elif d['event'] == 'playback-restart':
1263-
logger.info('====== playback-restarted\n{}\n\n'.format(self.oldUserInput))
1264-
logger.info('{}\n\n'.format(d['event']))
1263+
# logger.info('====== playback-restarted\n{}\n\n'.format(self.oldUserInput))
1264+
# logger.info('{}\n\n'.format(d['event']))
12651265
self.buffering = False
12661266
with self.buffering_lock:
12671267
self.buffering_change_function()
@@ -1280,7 +1280,7 @@ def updateMPVStatus(self, *args):
12801280
d['event'] == 'audio-reconfig') and \
12811281
self.buffering:
12821282
''' buffering '''
1283-
logger.info('{}\n\n'.format(d['event']))
1283+
# logger.info('{}\n\n'.format(d['event']))
12841284
if self.buffering and not self.playback_is_on:
12851285
logger.info('sending playback is on')
12861286
ret = self._set_mpv_playback_is_on(stop, enable_crash_detection_function)
@@ -1429,7 +1429,7 @@ def do_crash_detection(detect_if_player_exited, stop):
14291429
self.connecting = False
14301430
self._stop_delay_thread()
14311431
self.stations_history_add_function()
1432-
logger.info('checking: "{}"'.format(subsystemOut))
1432+
# logger.info('checking: "{}"'.format(subsystemOut))
14331433
if 'AO: [' in subsystemOut or \
14341434
'buffering done' in subsystemOut or \
14351435
'Buffering 100%' in subsystemOut:
@@ -1713,7 +1713,6 @@ def _get_mpv_metadata(self, *args):
17131713
return False
17141714

17151715
def _set_mpv_playback_is_on(self, stop, enable_crash_detection_function):
1716-
logger.error('self._set_mpv_playback_is_on!!!')
17171716
self.stop_timeout_counter_thread = True
17181717
try:
17191718
self.connection_timeout_thread.join()
@@ -1728,7 +1727,7 @@ def _set_mpv_playback_is_on(self, stop, enable_crash_detection_function):
17281727
except:
17291728
pass
17301729
self.stations_history_add_function()
1731-
logger.info('self.buffering = {}'.format(self.buffering))
1730+
# logger.info('self.buffering = {}'.format(self.buffering))
17321731
if self.buffering:
17331732
new_input = 'Buffering: ' + self.name
17341733
else:
@@ -2364,7 +2363,7 @@ def _buildStartOpts(self, streamUrl, playList=False):
23642363
self.buffering = self._player_is_buffering(opts, self.buffering_tokens)
23652364
with self.buffering_lock:
23662365
self.buffering_change_function()
2367-
logger.error('==== self.buffering = {}'.format(self.buffering))
2366+
# logger.error('==== self.buffering = {}'.format(self.buffering))
23682367

23692368
# logger.error('Opts:\n{}'.format(opts))
23702369
return opts, None
@@ -2845,7 +2844,7 @@ def _buildStartOpts(self, streamUrl, playList=False):
28452844
self.buffering = self._player_is_buffering(opts, self.buffering_tokens)
28462845
with self.buffering_lock:
28472846
self.buffering_change_function()
2848-
logger.error('---- self.buffering = {}'.format(self.buffering))
2847+
# logger.error('---- self.buffering = {}'.format(self.buffering))
28492848

28502849
if not self.buffering:
28512850
opts.remove('-msglevel')
@@ -3499,8 +3498,8 @@ class PlayerCache(object):
34993498
'--demuxer-readahead-secs=29',
35003499
],
35013500
'mplayer': [
3502-
'-cache=2000',
3503-
'-cache-min=80'
3501+
'-cache', '1000',
3502+
'-cache-min', '80'
35043503
],
35053504
'vlc': [
35063505
'--network-caching',
@@ -3532,7 +3531,7 @@ def delay(self):
35323531
if self._player_name == 'mpv':
35333532
return int(self._data['mpv'][0].replace('--cache-secs=', ''))
35343533
elif self._player_name == 'mplayer':
3535-
return int(self._data['mplayer'][0].replace('-cache=', ''))
3534+
return int(self._data['mplayer'][1])
35363535
else:
35373536
return int(self._data['vlc'][1])
35383537

@@ -3552,7 +3551,7 @@ def delay(self, a_delay):
35523551
x -= 1
35533552
self._data['mpv'][-1] = '--demuxer-readahead-secs=' + str(x)
35543553
elif self._player_name == 'mplayer':
3555-
self._data['mplayer'][0] = '-cache=' + str_x
3554+
self._data['mplayer'][1] = str_x
35563555
self._dirty = True
35573556

35583557
def _read(self):
@@ -3574,7 +3573,7 @@ def _save(self):
35743573
mpl = int(self._data['vlc'][1])
35753574
i_mpl = int(int(mpl) / 1000)
35763575
msg = self._data['mpv'][0].replace('--cache-secs=', '') + ',' + \
3577-
self._data['mplayer'][0].replace('-cache=', '') + ',' + \
3576+
self._data['mplayer'][1] + ',' + \
35783577
str(i_mpl)
35793578
try:
35803579
with open(self._data_file, 'w', encoding='utf-8') as f:

‎pyradio/radio.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,7 @@ def refreshBody(self, start=0):
12331233
display = False
12341234
if display:
12351235
if logger.isEnabledFor(logging.DEBUG):
1236-
logger.debug('Displaying mode {}'.format(self.ws.MODE_NAMES[self._redisplay_list[n][0]]))
1236+
# logger.debug('Displaying mode {}'.format(self.ws.MODE_NAMES[self._redisplay_list[n][0]]))
12371237
# if self.ws.MODE_NAMES[self._redisplay_list[n][0]] != 'PLAYER_PARAMS_MODE':
12381238
self._redisplay[self._redisplay_list[n][0]]()
12391239

@@ -4535,7 +4535,6 @@ def _show_recording_status_in_header(
45354535
if self._limited_height_mode or \
45364536
self._limited_width_mode:
45374537
return
4538-
logger.error('\n\n')
45394538
b_header = 'B' if self.player.buffering else ''
45404539
logger.info('player_disappeared = {}'.format(player_disappeared))
45414540
if self.player.recording == 0:
@@ -4548,7 +4547,7 @@ def _show_recording_status_in_header(
45484547
self.outerBodyWin.addstr(
45494548
0, 1, '────'.encode('utf-8'), curses.color_pair(13)
45504549
)
4551-
logger.error('self.player.buffering = {}'.format(self.player.buffering))
4550+
# logger.error('self.player.buffering = {}'.format(self.player.buffering))
45524551
if self.player.buffering:
45534552
self.outerBodyWin.addstr(0, 1, '[', curses.color_pair(13))
45544553
self.outerBodyWin.addstr(b_header, curses.color_pair(4))
@@ -5037,7 +5036,6 @@ def play_random(self):
50375036
self.refreshBody()
50385037

50395038
def _update_transparency(self, changed_from_config_window, calculate_transparency_function):
5040-
logger.info('|||| _update_transparency Launched')
50415039
self._toggle_transparency(
50425040
changed_from_config_window=changed_from_config_window,
50435041
calculate_transparency_function=calculate_transparency_function

‎pyradio/simple_curses_widgets.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2121,8 +2121,7 @@ def active(self, value):
21212121

21222122
@property
21232123
def selection(self):
2124-
'''Returns the widget's max_height '''
2125-
logger.error('=-=-=- selection = {}'.format(self._selection))
2124+
'''Returns the widget's selection '''
21262125
return self._selection
21272126

21282127
@selection.setter
@@ -2134,7 +2133,7 @@ def selection(self, value):
21342133

21352134
@property
21362135
def startPos(self):
2137-
'''Returns the widget's max_height '''
2136+
'''Returns the widget's startPos '''
21382137
return self._start_pos
21392138

21402139
@startPos.setter
@@ -2403,7 +2402,7 @@ def show(self, parent=None):
24032402
new_win = True
24042403

24052404
if self._too_small:
2406-
logger.error('Window is TOO SMALL')
2405+
# logger.error('Window is TOO SMALL')
24072406
self._win.addstr(1, 1, ' Window is', self._color)
24082407
self._win.addstr(2, 1, ' Too small', self._color)
24092408
self._win.refresh()
@@ -2580,13 +2579,13 @@ def _verify_selection_not_on_caption(self, movement=1):
25802579
# log_it('\n\n2 mov = {0}, sel = {1}, items = {2}'.format(movement, self._selection, len(self._items)))
25812580

25822581
def delete_item(self, index):
2583-
logger.info('items before delete\n{}'.format(self._items))
2582+
# logger.info('items before delete\n{}'.format(self._items))
25842583
d = deque(self._items)
25852584
d.rotate(-index)
25862585
ret = d.popleft()
25872586
d.rotate(index)
25882587
self._items = list(d)
2589-
logger.info('items after delete\n{}'.format(self._items))
2588+
# logger.info('items after delete\n{}'.format(self._items))
25902589
# log_it('=======> id = {0}, captions = {1}'.format(index, self._captions))
25912590
if self._has_captions:
25922591
for i in range(0, len(self._captions)):
@@ -2939,7 +2938,6 @@ def keypress(self, char):
29392938

29402939
if not self._toggle_selected_item():
29412940
self._refresh()
2942-
logger.error('j selection = {}'.format(self._selection))
29432941

29442942
elif char in self._local_functions.keys():
29452943
self._local_functions(char)

0 commit comments

Comments
 (0)