owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Audio naming clean up

Browse Source
This commit is contained in:
emeric
2014-10-19 20:41:15 +02:00
parent 8f6a6b858e
commit 67e9e79c0e
6 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.am
+2 -2
View File
@@ -42,8 +42,8 @@ lms_SOURCES = \
$(srcdir)/transcode/InputMediaFile.cpp \
$(srcdir)/ui/LmsApplication.cpp \
$(srcdir)/ui/auth/LmsAuth.cpp \
$(srcdir)/ui/audio/AudioWidget.cpp \
$(srcdir)/ui/audio/AudioMediaPlayerWidget.cpp \
$(srcdir)/ui/audio/Audio.cpp \
$(srcdir)/ui/audio/AudioMediaPlayer.cpp \
$(srcdir)/ui/audio/FilterChain.cpp \
$(srcdir)/ui/audio/KeywordSearchFilter.cpp \
$(srcdir)/ui/audio/TableFilter.cpp \
src/ui/LmsApplication.cpp
+5 -4
View File
@@ -38,7 +38,7 @@
#include "settings/SettingsFirstConnectionFormView.hpp"
#include "audio/AudioWidget.hpp"
#include "audio/Audio.hpp"
#include "video/VideoWidget.hpp"
#include "LmsApplication.hpp"
@@ -133,10 +133,10 @@ LmsApplication::handleAuthEvent(void)
Wt::WMenu *leftMenu = new Wt::WMenu(contentsStack);
navigation->addMenu(leftMenu);
AudioWidget *audioWidget = new AudioWidget(_sessionData);
Audio *audio = new Audio(_sessionData);
VideoWidget *videoWidget = new VideoWidget(_sessionData);
leftMenu->addItem("Audio", audioWidget);
leftMenu->addItem("Audio", audio);
leftMenu->addItem("Video", videoWidget);
leftMenu->addItem("Settings", new Settings::Settings(_sessionData));
@@ -164,7 +164,8 @@ LmsApplication::handleAuthEvent(void)
searchEdit->enterPressed().connect(std::bind([=] ()
{
audioWidget->search(searchEdit->text().toUTF8());
// TODO: check which view is activated and search into it
audio->search(searchEdit->text().toUTF8());
}));
navigation->addSearch(searchEdit, Wt::AlignLeft);
src/ui/audio/AudioWidget.cpp → src/ui/audio/Audio.cpp
+7 -6
View File
@@ -31,11 +31,11 @@
#include "KeywordSearchFilter.hpp"
#include "TrackView.hpp"
#include "AudioWidget.hpp"
#include "Audio.hpp"
namespace UserInterface {
AudioWidget::AudioWidget(SessionData& sessionData, Wt::WContainerWidget* parent)
Audio::Audio(SessionData& sessionData, Wt::WContainerWidget* parent)
: Wt::WContainerWidget(parent),
_db(sessionData.getDatabaseHandler()),
_mediaPlayer(nullptr)
@@ -95,29 +95,30 @@ _mediaPlayer(nullptr)
mainLayout->addLayout(playlist, 0, 1, 2, 1);
}
_mediaPlayer = new AudioMediaPlayerWidget();
_mediaPlayer = new AudioMediaPlayer();
mainLayout->addWidget(_mediaPlayer, 2, 0, 1, 2);
mainLayout->setRowStretch(1, 1);
mainLayout->setRowResizable(0, true, Wt::WLength(200, Wt::WLength::Pixel));
mainLayout->setColumnResizable(0, true);
trackView->trackSelected().connect(boost::bind(&AudioWidget::playTrack, this, _1));
trackView->trackSelected().connect(boost::bind(&Audio::playTrack, this, _1));
_mediaPlayer->playbackEnded().connect(std::bind([=] ()
{
// TODO link to playlist
trackView->selectNextTrack();
}));
}
void
AudioWidget::search(const std::string& searchText)
Audio::search(const std::string& searchText)
{
_filterChain.searchKeyword(searchText);
}
void
AudioWidget::playTrack(boost::filesystem::path p)
Audio::playTrack(boost::filesystem::path p)
{
LMS_LOG(MOD_UI, SEV_DEBUG) << "play track '" << p << "'";
try {
src/ui/audio/AudioWidget.hpp → src/ui/audio/Audio.hpp
+6 -6
View File
@@ -17,8 +17,8 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef AUDIO_WIDGET_HPP
#define AUDIO_WIDGET_HPP
#ifndef AUDIO_HPP
#define AUDIO_HPP
#include <string>
@@ -26,18 +26,18 @@
#include "common/SessionData.hpp"
#include "AudioMediaPlayerWidget.hpp"
#include "AudioMediaPlayer.hpp"
#include "FilterChain.hpp"
namespace UserInterface {
class AudioWidget : public Wt::WContainerWidget
class Audio : public Wt::WContainerWidget
{
public:
AudioWidget(SessionData& sessionData, Wt::WContainerWidget* parent = 0);
Audio(SessionData& sessionData, Wt::WContainerWidget* parent = 0);
void search(const std::string& searchText);
@@ -47,7 +47,7 @@ class AudioWidget : public Wt::WContainerWidget
Database::Handler& _db;
AudioMediaPlayerWidget* _mediaPlayer;
AudioMediaPlayer* _mediaPlayer;
FilterChain _filterChain;
src/ui/audio/AudioMediaPlayerWidget.cpp → src/ui/audio/AudioMediaPlayer.cpp
+19 -19
View File
@@ -21,11 +21,11 @@
#include <Wt/WMediaPlayer>
#include <Wt/WProgressBar>
#include "AudioMediaPlayerWidget.hpp"
#include "AudioMediaPlayer.hpp"
namespace UserInterface {
AudioMediaPlayerWidget::AudioMediaPlayerWidget( Wt::WContainerWidget *parent)
AudioMediaPlayer::AudioMediaPlayer( Wt::WContainerWidget *parent)
: Wt::WContainerWidget(parent),
_mediaResource(nullptr)
{
@@ -34,7 +34,7 @@ AudioMediaPlayerWidget::AudioMediaPlayerWidget( Wt::WContainerWidget *parent)
// _mediaPlayer->setOptions( Wt::WMediaPlayer::Autoplay );
_mediaPlayer->addSource( Wt::WMediaPlayer::OGA, "" );
_mediaPlayer->ended().connect(this, &AudioMediaPlayerWidget::handleTrackEnded);
_mediaPlayer->ended().connect(this, &AudioMediaPlayer::handleTrackEnded);
{
Wt::WContainerWidget *container = new Wt::WContainerWidget(this);
@@ -59,23 +59,23 @@ AudioMediaPlayerWidget::AudioMediaPlayerWidget( Wt::WContainerWidget *parent)
_mediaPlayer->setText( Wt::WMediaPlayer::CurrentTime, _curTime);
_mediaPlayer->setText( Wt::WMediaPlayer::Duration, _duration);
_mediaPlayer->timeUpdated().connect(this, &AudioMediaPlayerWidget::handleTimeUpdated);
_mediaPlayer->timeUpdated().connect(this, &AudioMediaPlayer::handleTimeUpdated);
}
_timeSlider->valueChanged().connect(this, &AudioMediaPlayerWidget::handlePlayOffset);
_timeSlider->sliderMoved().connect(this, &AudioMediaPlayerWidget::handleSliderMoved);
_timeSlider->valueChanged().connect(this, &AudioMediaPlayer::handlePlayOffset);
_timeSlider->sliderMoved().connect(this, &AudioMediaPlayer::handleSliderMoved);
_timeSlider->setDisabled(true);
_volumeSlider->sliderMoved().connect(this, &AudioMediaPlayerWidget::handleVolumeSliderMoved);
_volumeSlider->sliderMoved().connect(this, &AudioMediaPlayer::handleVolumeSliderMoved);
_nextBtn->clicked().connect(this, &AudioMediaPlayerWidget::handlePlayNext);
_prevBtn->clicked().connect(this, &AudioMediaPlayerWidget::handlePlayPrev);
_nextBtn->clicked().connect(this, &AudioMediaPlayer::handlePlayNext);
_prevBtn->clicked().connect(this, &AudioMediaPlayer::handlePlayPrev);
}
void
AudioMediaPlayerWidget::loadPlayer(void)
AudioMediaPlayer::loadPlayer(void)
{
_mediaPlayer->clearSources();
@@ -91,7 +91,7 @@ AudioMediaPlayerWidget::loadPlayer(void)
}
void
AudioMediaPlayerWidget::load(const Transcode::Parameters& parameters)
AudioMediaPlayer::load(const Transcode::Parameters& parameters)
{
_timeSlider->setDisabled(false);
@@ -108,7 +108,7 @@ AudioMediaPlayerWidget::load(const Transcode::Parameters& parameters)
}
void
AudioMediaPlayerWidget::handlePlayOffset(int offsetSecs)
AudioMediaPlayer::handlePlayOffset(int offsetSecs)
{
if (!_currentParameters)
return;
@@ -122,38 +122,38 @@ AudioMediaPlayerWidget::handlePlayOffset(int offsetSecs)
void
AudioMediaPlayerWidget::handlePlayNext(void)
AudioMediaPlayer::handlePlayNext(void)
{
// TODO
}
void
AudioMediaPlayerWidget::handlePlayPrev(void)
AudioMediaPlayer::handlePlayPrev(void)
{
// TODO
}
void
AudioMediaPlayerWidget::handleTrackEnded(void)
AudioMediaPlayer::handleTrackEnded(void)
{
_playbackEnded.emit();
}
void
AudioMediaPlayerWidget::handleValueChanged(double value)
AudioMediaPlayer::handleValueChanged(double value)
{
// TODO
}
void
AudioMediaPlayerWidget::handleSliderMoved(int value)
AudioMediaPlayer::handleSliderMoved(int value)
{
;
}
void
AudioMediaPlayerWidget::handleTimeUpdated(void)
AudioMediaPlayer::handleTimeUpdated(void)
{
if (!_currentParameters)
return;
@@ -165,7 +165,7 @@ AudioMediaPlayerWidget::handleTimeUpdated(void)
}
void
AudioMediaPlayerWidget::handleVolumeSliderMoved(int value)
AudioMediaPlayer::handleVolumeSliderMoved(int value)
{
_mediaPlayer->setVolume( value / 100. );
}
src/ui/audio/AudioMediaPlayerWidget.hpp → src/ui/audio/AudioMediaPlayer.hpp
+4 -4
View File
@@ -17,8 +17,8 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __MEDIA_PLAYER_WIDGET_HPP
#define __MEDIA_PLAYER_WIDGET_HPP
#ifndef __AUDIO_MEDIA_PLAYER_HPP
#define __AUDIO_MEDIA_PLAYER_HPP
#include <memory>
@@ -34,11 +34,11 @@
namespace UserInterface {
class AudioMediaPlayerWidget : public Wt::WContainerWidget
class AudioMediaPlayer : public Wt::WContainerWidget
{
public:
AudioMediaPlayerWidget( Wt::WContainerWidget *parent = 0);
AudioMediaPlayer( Wt::WContainerWidget *parent = 0);
void load(const Transcode::Parameters& parameters);