Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

build
*.log
16 changes: 16 additions & 0 deletions src/bino.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ void Bino::startPlaylistMode()
if (state == QMediaPlayer::StoppedState)
Playlist::instance()->mediaEnded();
});
_player->connect(_player, &QMediaPlayer::positionChanged,
[=](qint64 position) {
emit updatePlayerPosition(position);
});

emit stateChanged();
}
Expand Down Expand Up @@ -281,6 +285,13 @@ void Bino::setPosition(float pos)
_player->setPosition(pos * _player->duration());
}

void Bino::setPosition(qint64 pos)
{
if (!playlistMode())
return;
_player->setPosition(pos);
}

void Bino::togglePause()
{
if (!playlistMode())
Expand Down Expand Up @@ -433,6 +444,11 @@ bool Bino::stopped() const
return (playlistMode() && _player->playbackState() == QMediaPlayer::StoppedState);
}

qint64 Bino::duration() const
{
return _player->duration();
}

QUrl Bino::url() const
{
QUrl url;
Expand Down
4 changes: 4 additions & 0 deletions src/bino.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ Q_OBJECT
void quit();
void seek(qint64 milliseconds);
void setPosition(float pos);
void setPosition(qint64 pos);
void togglePause();
void pause();
void play();
Expand All @@ -159,6 +160,7 @@ Q_OBJECT
bool paused() const;
bool playing() const;
bool stopped() const;
qint64 duration() const;
QUrl url() const;
int videoTrack() const;
int audioTrack() const;
Expand Down Expand Up @@ -204,4 +206,6 @@ public slots:
void toggleFullscreen();
void stateChanged();
void wantQuit();
void updatePlayerPosition(qint64);

};
39 changes: 39 additions & 0 deletions src/gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,15 @@ Gui::Gui(OutputMode outputMode, float surroundVerticalFOV, bool fullscreen) :
connect(helpAboutAction, SIGNAL(triggered()), this, SLOT(helpAbout()));
addBinoAction(helpAboutAction, helpMenu);

// create seekbar
_toolBar = new QToolBar(_widget);
_toolBarSlider = new QSlider(Qt::Horizontal, _toolBar);
connect(_toolBarSlider, SIGNAL(sliderReleased()), this, SLOT(sliderReleased()));
connect(_toolBarSlider, SIGNAL(sliderMoved(int)), this, SLOT(sliderMoved(int)));
connect(Bino::instance(), SIGNAL(updatePlayerPosition(qint64)), this, SLOT(updateSliderPosition(qint64)));
_toolBar->addWidget(_toolBarSlider);
addToolBar(Qt::BottomToolBarArea, _toolBar);

updateActions();
connect(Bino::instance(), SIGNAL(stateChanged()), this, SLOT(updateActions()));

Expand Down Expand Up @@ -959,9 +968,39 @@ void Gui::updateActions()
_mediaSeekFwd10MinsAction->setEnabled(Bino::instance()->playlistMode() && !Bino::instance()->stopped());
_mediaSeekBwd10MinsAction->setEnabled(Bino::instance()->playlistMode() && !Bino::instance()->stopped());

if ( Bino::instance()->playlistMode() ) {
_toolBarSlider->setRange(0, Bino::instance()->duration());
} else {
_toolBarSlider->setRange(0, 0);
}

_widget->update();
}

void Gui::sliderReleased()
{
if ( Bino::instance()->playlistMode() ) {
Bino::instance()->play();
}
}

void Gui::sliderMoved(int value)
{
if ( Bino::instance()->playlistMode() ) {
qint64 val = value;
if ( 0 <= val && val < Bino::instance()->duration() )
Bino::instance()->setPosition(val);
}
}

void Gui::updateSliderPosition(qint64 position)
{
if ( Bino::instance()->playlistMode() ) {
_toolBarSlider->setSliderPosition(position);
_widget->update();
}
}

void Gui::setOutputMode(OutputMode mode)
{
_widget->setOutputMode(mode);
Expand Down
8 changes: 8 additions & 0 deletions src/gui.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#pragma once

#include <QMainWindow>
#include <QSlider>
#include <QToolBar>

#include "modes.hpp"
#include "widget.hpp"
Expand Down Expand Up @@ -60,6 +62,9 @@ Q_OBJECT
QAction* _viewToggleSwapEyesAction;
QAction* _viewResetSurroundAction;

QToolBar* _toolBar;
QSlider* _toolBarSlider;

QMenu* addBinoMenu(const QString& title);
void addBinoAction(QAction* action, QMenu* menu);

Expand Down Expand Up @@ -99,6 +104,9 @@ public slots:
void helpAbout();

void updateActions();
void sliderReleased();
void sliderMoved(int);
void updateSliderPosition(qint64);

protected:
virtual void dragEnterEvent(QDragEnterEvent*) override;
Expand Down