summaryrefslogtreecommitdiff
path: root/bass_player.rb
diff options
context:
space:
mode:
Diffstat (limited to 'bass_player.rb')
-rw-r--r--bass_player.rb26
1 files changed, 13 insertions, 13 deletions
diff --git a/bass_player.rb b/bass_player.rb
index 9d8b00c..9a1d90a 100644
--- a/bass_player.rb
+++ b/bass_player.rb
@@ -13,7 +13,7 @@ module BassPlayer
property(:current_song) { '' }
property(:current_segment) { '' }
property(:model) { QML::ArrayModel.new(:title, :duration) }
- property(:part_model) {
+ property(:segment_model) {
QML::ArrayModel.new(:name, :from, :to)
}
@@ -54,22 +54,22 @@ module BassPlayer
self.current_song = model[row][:title]
end
- # Clear current segment
+ segment_model.clear
self.current_segment = nil
- # Update model
song = Song.first(title: self.current_song)
- part_model.clear
- parts = song.parts.map do |part|
+
+ segments = Song.first(title: self.current_song).segments.map do |segment|
{
- name: part.name,
- from: ms_to_time(part.from),
- to: ms_to_time(part.to)
+ name: segment.name,
+ from: ms_to_time(segment.from),
+ to: ms_to_time(segment.to)
}
end
- for part in parts
- part_model << part
+
+ for segment in segments
+ segment_model << segment
end
return {
path: song.path,
@@ -79,12 +79,12 @@ module BassPlayer
def segment_selected(row)
song = Song.first(title: self.current_song)
- self.current_segment = song.parts[row.to_i].to_hash
+ self.current_segment = song.segments[row.to_i].to_hash
end
def add_segment(name, from, to)
song = Song.first(title: current_song)
- Part.create(
+ Segment.create(
name: name, from: parse_time(from), to: parse_time(to),
song_id: song.id
)
@@ -92,7 +92,7 @@ module BassPlayer
end
def ms_to_time(ms)
- retval = Time.at(ms/1000).utc.strftime("%H:%M:%S")
+ retval = Time.at(ms/1000).utc.strftime("%M:%S")
return retval
end