Skip to content

Commit

Permalink
Added options
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ohmnivore
Ohmnivore committed Nov 17, 2015
1 parent 2f99fb8 commit 8659366
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 14 deletions.
2 changes: 1 addition & 1 deletion SpaceVideo.pro
View file
Expand Up @@ -4,7 +4,7 @@
#
#-------------------------------------------------

QT += core gui avwidgets opengl
QT += core gui

greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

Expand Down
51 changes: 50 additions & 1 deletion options.cpp
View file
@@ -1,25 +1,74 @@
#include "options.h"
#include "ui_options.h"

#include <QDebug>

#include <VLCQtCore/Audio.h>
#include <VLCQtCore/Video.h>

Options::Options(MainWindow* parent) :
QWidget(parent),
ui(new Ui::Options)
{
ui->setupUi(this);
win = parent;

connect(ui->videoBox, SIGNAL(activated(int)), this, SLOT(videoSet(int)));
connect(ui->audioBox, SIGNAL(activated(int)), this, SLOT(audioSet(int)));
connect(ui->subtitleBox, SIGNAL(activated(int)), this, SLOT(subtitleSet(int)));
}

Options::~Options()
{
delete ui;
}

void Options::updateAV()
void Options::updateVideo()
{
ui->videoBox->clear();
QStringList descr = win->m_player->video()->trackDescription();
QList<int> id = win->m_player->video()->trackIds();
for (int i = 0; i < descr.size(); ++i)
ui->videoBox->addItem(descr.at(i), id.at(i));
ui->videoBox->setCurrentIndex(win->m_player->video()->track());
}

void Options::updateAudio()
{
ui->audioBox->clear();
QStringList descr = win->m_player->audio()->trackDescription();
QList<int> id = win->m_player->audio()->trackIds();
for (int i = 0; i < descr.size(); ++i)
ui->audioBox->addItem(descr.at(i), id.at(i));
ui->audioBox->setCurrentIndex(win->m_player->audio()->track());
}

void Options::updateSubtitles()
{
qDebug() << win->m_player->video()->subtitleDescription();

ui->subtitleBox->clear();
QStringList descr = win->m_player->video()->subtitleDescription();
QList<int> id = win->m_player->video()->subtitleIds();
for (int i = 0; i < descr.size(); ++i)
ui->subtitleBox->addItem(descr.at(i), id.at(i));
ui->subtitleBox->setCurrentIndex(win->m_player->video()->subtitle());
}

void Options::videoSet(int id)
{
int track = ui->videoBox->itemData(id).toInt();
win->m_player->video()->setTrack(track);
}

void Options::audioSet(int id)
{
int track = ui->audioBox->itemData(id).toInt();
win->m_player->audio()->setTrack(track);
}

void Options::subtitleSet(int id)
{
int track = ui->subtitleBox->itemData(id).toInt();
win->m_player->video()->setSubtitle(track);
}
8 changes: 7 additions & 1 deletion options.h
View file
Expand Up @@ -18,8 +18,14 @@ class Options : public QWidget

explicit Options(MainWindow *parent = 0);
~Options();
void updateAV();

public slots:
void updateVideo();
void updateAudio();
void updateSubtitles();
void videoSet(int);
void audioSet(int);
void subtitleSet(int);

private:
Ui::Options *ui;
Expand Down
18 changes: 9 additions & 9 deletions options.ui
View file
Expand Up @@ -56,12 +56,12 @@
<number>6</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="videoLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<widget class="QLabel" name="videoLabel">
<property name="text">
<string>Video Track</string>
</property>
Expand All @@ -71,7 +71,7 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox">
<widget class="QComboBox" name="videoBox">
<property name="editable">
<bool>false</bool>
</property>
Expand All @@ -83,12 +83,12 @@
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<layout class="QVBoxLayout" name="audioLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="audioLabel">
<property name="text">
<string>Audio Track</string>
</property>
Expand All @@ -98,17 +98,17 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_2"/>
<widget class="QComboBox" name="audioBox"/>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<layout class="QVBoxLayout" name="subtitleLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_3">
<widget class="QLabel" name="subtitleLabel">
<property name="text">
<string>Subtitles</string>
</property>
Expand All @@ -118,7 +118,7 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_3"/>
<widget class="QComboBox" name="subtitleBox"/>
</item>
</layout>
</item>
Expand Down
11 changes: 9 additions & 2 deletions toolbar.cpp
View file
Expand Up @@ -69,13 +69,16 @@ void Toolbar::onToggleBtnClicked()
void Toolbar::maximize()
{
win->showMaximized();
appear();
}
void Toolbar::fullscreen()
{
win->showFullScreen();
appear();
}
void Toolbar::onFullscreenBtnClicked()
{
hide();
if (win->windowState().testFlag(Qt::WindowFullScreen))
QTimer::singleShot(0, this, SLOT(maximize()));
else
Expand All @@ -95,7 +98,9 @@ void Toolbar::onOpenBtnClicked()
ui->VolumeSlider->setEnabled(true);
ui->TrackSlider->setEnabled(true);

win->m_opt->updateAV();
QTimer::singleShot(3000, win->m_opt, SLOT(updateVideo()));
QTimer::singleShot(3000, win->m_opt, SLOT(updateAudio()));
QTimer::singleShot(3000, win->m_opt, SLOT(updateSubtitles()));
}

void Toolbar::onSubBtnClicked()
Expand All @@ -104,7 +109,7 @@ void Toolbar::onSubBtnClicked()
if (file.isEmpty())
return;
win->m_player->video()->setSubtitleFile(file);
win->m_opt->updateSubtitles();
QTimer::singleShot(3000, win->m_opt, SLOT(updateSubtitles()));
}

void Toolbar::onOptionsBtnClicked()
Expand All @@ -118,9 +123,11 @@ void Toolbar::onOptionsBtnClicked()
void Toolbar::minimize()
{
win->showMinimized();
appear();
}
void Toolbar::onMinimizeBtnClicked()
{
hide();
QTimer::singleShot(0, this, SLOT(minimize()));
}

Expand Down

0 comments on commit 8659366

Please sign in to comment.