Skip to content

Commit c356238

Browse files
committed
refactor: move widgets to separate files
1 parent cff04fd commit c356238

4 files changed

Lines changed: 280 additions & 254 deletions

File tree

‎player/src/gui.rs‎

Lines changed: 9 additions & 254 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
1-
use std::cell::RefCell;
2-
use std::rc::Rc;
3-
41
use fltk::app::Sender;
52
use fltk::browser::*;
63
use fltk::button::*;
74
use fltk::draw;
85
use fltk::enums::*;
96
use fltk::frame::*;
107
use fltk::group::Group;
11-
use fltk::group::Pack;
128
use fltk::image;
13-
use fltk::image::Image;
149
use fltk::image::PngImage;
15-
use fltk::input::*;
1610
use fltk::prelude::*;
1711
use fltk::valuator::*;
18-
use fltk::widget;
19-
use fltk::widget_extends;
2012
use fltk::window::*;
2113

22-
use crate::main;
2314
use crate::UIEvent;
2415

16+
mod bitrate_bar;
17+
mod marquee_label;
18+
mod visualizer;
19+
use self::bitrate_bar::*;
20+
use self::marquee_label::*;
21+
use self::visualizer::*;
22+
2523
pub struct MainWindow {
2624
pub main_win: Window,
2725
pub seek_bar: HorNiceSlider,
@@ -142,7 +140,7 @@ impl MainWindow {
142140
let mut art_frame = Frame::new(228, 34, 31, 31, "");
143141
art_frame.set_align(Align::ImageBackdrop);
144142
art_frame.set_frame(FrameType::DownFrame);
145-
143+
146144
display.add(&art_frame);
147145

148146
let lbl_title = MarqueeLabel::new(105, 35, 120);
@@ -174,7 +172,7 @@ impl MainWindow {
174172
volume_slider.set_bounds(0., 1.);
175173
volume_slider.set_step(0.01, 1);
176174
let tmp = s.clone();
177-
volume_slider.set_callback(move|vs| {
175+
volume_slider.set_callback(move |vs| {
178176
tmp.send(UIEvent::VolumeSlider(Self::volume_scale(vs.value())));
179177
});
180178
main_win.add(&volume_slider);
@@ -329,249 +327,6 @@ fn create_horizontal_gradient_frame(
329327
frame
330328
}
331329

332-
pub struct Visualizer {
333-
inner: widget::Widget,
334-
values: Rc<RefCell<[u8; 14]>>, // 14 bars (height 0 to 8)
335-
prev_vals: [u8; 14],
336-
timing: bool,
337-
}
338-
339-
widget_extends!(Visualizer, widget::Widget, inner);
340-
341-
impl Visualizer {
342-
pub fn new(x: i32, y: i32) -> Self {
343-
let mut inner = widget::Widget::default().with_size(41, 20).with_pos(x, y);
344-
inner.set_frame(FrameType::FlatBox);
345-
346-
let values = [5; 14];
347-
let values = Rc::from(RefCell::from(values));
348-
let v = values.clone();
349-
350-
inner.draw(move |i| {
351-
draw::draw_box(i.frame(), i.x(), i.y(), i.w(), i.h(), i.color());
352-
draw::set_draw_color(Color::Black);
353-
draw::draw_xyline(i.x(), i.y() + 16, i.x() + (14 * 3) - 2);
354-
for bar in 0..14 {
355-
let value = v.borrow()[bar] as i32;
356-
for val in 0..value {
357-
let x = i.x() + bar as i32 * 3;
358-
let y = i.y() + (7 - val) * 2;
359-
draw::draw_xyline(x, y, x + 1);
360-
}
361-
}
362-
});
363-
364-
Self {
365-
inner,
366-
values,
367-
timing: false,
368-
prev_vals: [0;14],
369-
}
370-
}
371-
pub fn update_values(&mut self, values: [u8; 14]) {
372-
{
373-
let prev = self.values.borrow().clone();
374-
let mut sv = self.values.borrow_mut();
375-
let temp = sv.clone();
376-
for i in 0..14 {
377-
if values[i] > prev[i] {
378-
sv[i] = ((prev[i] as usize + self.prev_vals[i] as usize + values[i] as usize) / 3 as usize) as u8;
379-
} else if sv[i] > 1 {
380-
if self.timing {
381-
sv[i] = sv[i] - 1;
382-
}
383-
} else {
384-
sv[i] = 0;
385-
}
386-
}
387-
self.timing = !self.timing;
388-
self.prev_vals = temp;
389-
}
390-
self.redraw();
391-
}
392-
}
393-
394-
pub struct BitrateBar {
395-
inner: widget::Widget,
396-
bitrate: Rc<RefCell<usize>>,
397-
buffer_level: Rc<RefCell<u8>>, // 0 to 6
398-
}
399-
400-
widget_extends!(BitrateBar, widget::Widget, inner);
401-
402-
impl BitrateBar {
403-
pub fn new(x: i32, y: i32) -> Self {
404-
let mut inner = widget::Widget::default().with_size(35, 14).with_pos(x, y);
405-
inner.set_frame(FrameType::FlatBox);
406-
407-
let bitrate = 0;
408-
let bitrate_c = Rc::from(RefCell::from(bitrate));
409-
let bitrate_c_c = bitrate_c.clone();
410-
411-
let buffer_level = 0;
412-
let buffer_level_c = Rc::from(RefCell::from(buffer_level));
413-
let buffer_level_c_c = buffer_level_c.clone();
414-
415-
let mut font = PngImage::from_data(include_bytes!("../rsrc/font.png")).unwrap();
416-
417-
let mut buf_bar = PngImage::from_data(include_bytes!("../rsrc/bufbar.png")).unwrap();
418-
419-
inner.draw(move |i| {
420-
draw::draw_box(i.frame(), i.x(), i.y(), i.w(), i.h(), i.color());
421-
draw::set_draw_color(Color::Black);
422-
let br = bitrate_c_c.borrow();
423-
let br_chars = format!("{}k", br);
424-
let mut x = 0;
425-
for c in br_chars.chars().rev() {
426-
let (cx, w) = Self::char_offset(c);
427-
font.draw_ext(i.x() + i.width() - x - w, i.y(), w - 1, 5, cx, 0);
428-
x += w - 1;
429-
}
430-
431-
let bl = buffer_level_c_c.borrow();
432-
buf_bar.draw(i.x(), i.y() + 6, 34, 4);
433-
if *bl > 0 {
434-
let w = (*bl as i32 * 5).min(30);
435-
draw::draw_rect_fill(i.x() + 1, i.y() + 7, w + 1, 2, Color::Black);
436-
}
437-
});
438-
439-
Self {
440-
inner,
441-
bitrate: bitrate_c,
442-
buffer_level: buffer_level_c,
443-
}
444-
}
445-
fn char_offset(c: char) -> (i32, i32) {
446-
match c {
447-
// x-pos, width
448-
'0' => (0, 7),
449-
'1' => (7, 4),
450-
'2' => (12, 7),
451-
'3' => (19, 7),
452-
'4' => (26, 7),
453-
'5' => (33, 6),
454-
'6' => (40, 6),
455-
'7' => (47, 6),
456-
'8' => (54, 6),
457-
'9' => (61, 6),
458-
'k' => (68, 19), // "kbps"
459-
_ => (0, 0),
460-
}
461-
}
462-
pub fn update_bitrate(&mut self, bitrate: usize) {
463-
self.bitrate.replace(bitrate);
464-
self.redraw();
465-
}
466-
pub fn update_buffer_level(&mut self, level: u8) {
467-
self.buffer_level.replace(level);
468-
self.redraw();
469-
}
470-
}
471-
472-
pub struct MarqueeLabel {
473-
inner: widget::Widget,
474-
offset: Rc<RefCell<i32>>,
475-
text: Rc<RefCell<String>>,
476-
start_timer: usize,
477-
each_timer: usize,
478-
}
479-
480-
widget_extends!(MarqueeLabel, widget::Widget, inner);
481-
482-
impl MarqueeLabel {
483-
pub fn new(x: i32, y: i32, width: i32) -> Self {
484-
let mut inner = widget::Widget::default().with_size(width, 16).with_pos(x, y);
485-
inner.set_frame(FrameType::FlatBox);
486-
487-
let offset = 0;
488-
let offset_h = Rc::new(RefCell::new(offset));
489-
let offset_h2 = offset_h.clone();
490-
491-
let text = String::from("");
492-
let text_h = Rc::new(RefCell::new(text));
493-
let text_h2 = text_h.clone();
494-
495-
inner.draw(move |i| {
496-
let mut offset = offset_h.borrow_mut();
497-
let label = text_h.borrow();
498-
let (text_width, _) = draw::measure(&label, false);
499-
500-
let os_two = if text_width >= i.w() {
501-
text_width
502-
} else {
503-
// we reallllllly don't care if the width is less
504-
*offset = 0;
505-
0
506-
};
507-
508-
draw::push_clip(i.x(), i.y(), i.w(), i.h());
509-
draw::draw_box(i.frame(), i.x(), i.y(), i.w(), i.h(), i.color());
510-
draw::set_draw_color(Color::Black);
511-
draw::set_font(Font::Helvetica, 14);
512-
draw::draw_text(&*label, i.x() + *offset, i.y() + 12);
513-
514-
draw::draw_text(&*label, i.x() + *offset + i.width() + os_two, i.y() + 12);
515-
draw::pop_clip();
516-
517-
if *offset + i.width() + os_two <= 0 {
518-
*offset = 0;
519-
}
520-
});
521-
522-
Self {
523-
inner,
524-
offset: offset_h2,
525-
text: text_h2,
526-
start_timer: 1,
527-
each_timer: 0,
528-
}
529-
}
530-
pub fn nudge(&mut self, offset: i32) {
531-
*self.offset.borrow_mut() += offset;
532-
self.redraw();
533-
}
534-
pub fn zero(&mut self) {
535-
*self.offset.borrow_mut() = 0;
536-
self.start_timer = 0;
537-
self.redraw();
538-
}
539-
pub fn set_text(&mut self, text: &String) {
540-
*self.text.borrow_mut() = text.to_owned();
541-
self.redraw();
542-
}
543-
pub fn waited_long_enough(&mut self) -> bool {
544-
const EACH_DELAY: usize = 4;
545-
const START_DELAY: usize = 25;
546-
547-
let offset = *self.offset.borrow();
548-
549-
if self.start_timer > 0 {
550-
if self.start_timer > START_DELAY {
551-
self.start_timer = 0;
552-
true
553-
} else {
554-
self.start_timer += 1;
555-
false
556-
}
557-
} else {
558-
if self.each_timer > EACH_DELAY {
559-
if offset == 0 {
560-
self.start_timer = 1;
561-
self.each_timer = 0;
562-
false
563-
} else {
564-
self.each_timer = 0;
565-
true
566-
}
567-
} else {
568-
self.each_timer += 1;
569-
false
570-
}
571-
}
572-
}
573-
}
574-
575330
#[cfg(target_os = "windows")]
576331
use winapi::shared::windef::HWND;
577332

‎player/src/gui/bitrate_bar.rs‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
use std::cell::RefCell;
2+
use std::rc::Rc;
3+
4+
use fltk::draw;
5+
use fltk::enums::*;
6+
use fltk::image::PngImage;
7+
use fltk::prelude::*;
8+
use fltk::widget;
9+
use fltk::widget_extends;
10+
11+
pub struct BitrateBar {
12+
inner: widget::Widget,
13+
bitrate: Rc<RefCell<usize>>,
14+
buffer_level: Rc<RefCell<u8>>, // 0 to 6
15+
}
16+
17+
widget_extends!(BitrateBar, widget::Widget, inner);
18+
19+
impl BitrateBar {
20+
pub fn new(x: i32, y: i32) -> Self {
21+
let mut inner = widget::Widget::default().with_size(35, 14).with_pos(x, y);
22+
inner.set_frame(FrameType::FlatBox);
23+
24+
let bitrate = 0;
25+
let bitrate_c = Rc::from(RefCell::from(bitrate));
26+
let bitrate_c_c = bitrate_c.clone();
27+
28+
let buffer_level = 0;
29+
let buffer_level_c = Rc::from(RefCell::from(buffer_level));
30+
let buffer_level_c_c = buffer_level_c.clone();
31+
32+
let mut font = PngImage::from_data(include_bytes!("../../rsrc/font.png")).unwrap();
33+
34+
let mut buf_bar = PngImage::from_data(include_bytes!("../../rsrc/bufbar.png")).unwrap();
35+
36+
inner.draw(move |i| {
37+
draw::draw_box(i.frame(), i.x(), i.y(), i.w(), i.h(), i.color());
38+
draw::set_draw_color(Color::Black);
39+
let br = bitrate_c_c.borrow();
40+
let br_chars = format!("{}k", br);
41+
let mut x = 0;
42+
for c in br_chars.chars().rev() {
43+
let (cx, w) = Self::char_offset(c);
44+
font.draw_ext(i.x() + i.width() - x - w, i.y(), w - 1, 5, cx, 0);
45+
x += w - 1;
46+
}
47+
48+
let bl = buffer_level_c_c.borrow();
49+
buf_bar.draw(i.x(), i.y() + 6, 34, 4);
50+
if *bl > 0 {
51+
let w = (*bl as i32 * 5).min(30);
52+
draw::draw_rect_fill(i.x() + 1, i.y() + 7, w + 1, 2, Color::Black);
53+
}
54+
});
55+
56+
Self {
57+
inner,
58+
bitrate: bitrate_c,
59+
buffer_level: buffer_level_c,
60+
}
61+
}
62+
fn char_offset(c: char) -> (i32, i32) {
63+
match c {
64+
// x-pos, width
65+
'0' => (0, 7),
66+
'1' => (7, 4),
67+
'2' => (12, 7),
68+
'3' => (19, 7),
69+
'4' => (26, 7),
70+
'5' => (33, 6),
71+
'6' => (40, 6),
72+
'7' => (47, 6),
73+
'8' => (54, 6),
74+
'9' => (61, 6),
75+
'k' => (68, 19), // "kbps"
76+
_ => (0, 0),
77+
}
78+
}
79+
pub fn update_bitrate(&mut self, bitrate: usize) {
80+
self.bitrate.replace(bitrate);
81+
self.redraw();
82+
}
83+
pub fn update_buffer_level(&mut self, level: u8) {
84+
self.buffer_level.replace(level);
85+
self.redraw();
86+
}
87+
}

0 commit comments

Comments
 (0)