Skip to content

Commit 6158cd1

Browse files
committed
store last track fadeout setting in db
1 parent 4b6c1e9 commit 6158cd1

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

obplayer/scheduler/data.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def verify_backup(self):
106106

107107
def shows_create_table(self):
108108
self.execute(
109-
"CREATE TABLE shows (id INTEGER PRIMARY KEY, show_id INTEGER, name TEXT, type TEXT, description TEXT, datetime NUMERIC UNIQUE, duration NUMERIC, last_updated NUMERIC, last_track_fade NUMERIC)"
109+
"CREATE TABLE shows (id INTEGER PRIMARY KEY, show_id INTEGER, name TEXT, type TEXT, description TEXT, datetime NUMERIC UNIQUE, duration NUMERIC, last_updated NUMERIC, last_track_fadeout TEXT)"
110110
)
111111
self.execute("CREATE UNIQUE INDEX datetime_index on shows (datetime)")
112112

@@ -205,7 +205,7 @@ def get_show(self, show_id, last_updated, datetime):
205205
# Return false if edit not required. Return lastrowid otherwise.
206206
#
207207
def show_addedit(
208-
self, show_id, name, show_type, description, datetime, duration, last_updated
208+
self, show_id, name, show_type, description, datetime, duration, last_updated, last_track_fadeout='auto'
209209
):
210210
# determine whether there is already a show in this slot.
211211
rows = self.execute(
@@ -241,7 +241,7 @@ def show_addedit(
241241
str(datetime),
242242
duration,
243243
str(last_updated),
244-
0, # last_track_fade
244+
str(last_track_fadeout)
245245
),
246246
)
247247
return self.db.last_insert_rowid()

obplayer/scheduler/sync.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,11 @@ def sync_shows(self, ignore_showlock=False):
435435
show_last_updated = xml_get_first_tag_value(show, "last_updated", 0)
436436
show_media = xml_get_direct_children(show, "media")[0]
437437
show_voicetracks = xml_get_direct_children(show, "voicetracks")
438+
show_last_track_fadeout = show.getElementsByTagName("last_track_fadeout")
439+
if len(show_last_track_fadeout) > 0:
440+
show_last_track_fadeout = xml_get_text(show_last_track_fadeout[0])
441+
else:
442+
show_last_track_fadeout = "auto"
438443

439444
if len(show_voicetracks) > 0:
440445
show_voicetracks = show_voicetracks[0]
@@ -487,6 +492,7 @@ def sync_shows(self, ignore_showlock=False):
487492
show_start_timestamp,
488493
show_duration,
489494
show_last_updated,
495+
show_last_track_fadeout,
490496
)
491497

492498
start_times_list.append(show_start_timestamp)

0 commit comments

Comments
 (0)