@@ -299,11 +299,7 @@ def display_card(self, card_num):
299
299
self ._display_background_for (card )
300
300
self .backlight_fade (1.0 )
301
301
self ._display_text_for (card )
302
- try :
303
- self ._display .refresh (target_frames_per_second = 60 )
304
- except AttributeError :
305
- self ._display .refresh_soon ()
306
- self ._display .wait_for_frame ()
302
+ self ._display .refresh (target_frames_per_second = 60 )
307
303
308
304
self ._play_sound_for (card )
309
305
@@ -342,10 +338,7 @@ def play_sound(self, filename, *, wait_to_finish=True, loop=False):
342
338
return # nothing more to do, just stopped
343
339
filename = self ._gamedirectory + "/" + filename
344
340
print ("Playing sound" , filename )
345
- try :
346
- self ._display .refresh (target_frames_per_second = 60 )
347
- except AttributeError :
348
- self ._display .wait_for_frame ()
341
+ self ._display .refresh (target_frames_per_second = 60 )
349
342
try :
350
343
self ._wavfile = open (filename , "rb" )
351
344
except OSError as err :
@@ -416,16 +409,10 @@ def set_background(self, filename, *, with_fade=True):
416
409
),
417
410
# TODO: Once CP6 is no longer supported, replace the above line with below
418
411
# pixel_shader=background.pixel_shader,
419
- x = 0 ,
420
- y = 0 ,
421
412
)
422
413
self ._background_group .append (self ._background_sprite )
423
414
if with_fade :
424
- try :
425
- self ._display .refresh (target_frames_per_second = 60 )
426
- except AttributeError :
427
- self ._display .refresh_soon ()
428
- self ._display .wait_for_frame ()
415
+ self ._display .refresh (target_frames_per_second = 60 )
429
416
self .backlight_fade (1.0 )
430
417
431
418
def backlight_fade (self , to_light ):
0 commit comments