From 43211d8aeebcd011e295a7a9a7a2990a9e329541 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 6 Apr 2015 17:46:01 +0200 Subject: [PATCH] Switched default encoding to MP3, seems to be better supported --- src/ui/audio/desktop/AudioMediaPlayer.cpp | 10 ++-------- src/ui/audio/mobile/MobileAudioMediaPlayer.cpp | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/ui/audio/desktop/AudioMediaPlayer.cpp b/src/ui/audio/desktop/AudioMediaPlayer.cpp index 8ceb00e2..4748856e 100644 --- a/src/ui/audio/desktop/AudioMediaPlayer.cpp +++ b/src/ui/audio/desktop/AudioMediaPlayer.cpp @@ -23,8 +23,6 @@ #include #include #include -#include -#include #include "AudioMediaPlayer.hpp" @@ -34,12 +32,8 @@ namespace Desktop { Wt::WMediaPlayer::Encoding AudioMediaPlayer::getBestEncoding() { - const Wt::WEnvironment& env = Wt::WApplication::instance()->environment(); - - if (env.agentIsIE()) - return Wt::WMediaPlayer::MP3; - else - return Wt::WMediaPlayer::OGA; + // MP3 seems to be better supported everywhere + return Wt::WMediaPlayer::MP3; } AudioMediaPlayer::AudioMediaPlayer( Wt::WMediaPlayer::Encoding encoding, Wt::WContainerWidget *parent) diff --git a/src/ui/audio/mobile/MobileAudioMediaPlayer.cpp b/src/ui/audio/mobile/MobileAudioMediaPlayer.cpp index f04d6027..c7142f63 100644 --- a/src/ui/audio/mobile/MobileAudioMediaPlayer.cpp +++ b/src/ui/audio/mobile/MobileAudioMediaPlayer.cpp @@ -17,8 +17,6 @@ * along with LMS. If not, see . */ -#include -#include #include "MobileAudioMediaPlayer.hpp" @@ -30,12 +28,8 @@ namespace Mobile { Wt::WMediaPlayer::Encoding AudioMediaPlayer::getBestEncoding() { - const Wt::WEnvironment& env = Wt::WApplication::instance()->environment(); - - if (env.agentIsIE()) - return Wt::WMediaPlayer::MP3; - else - return Wt::WMediaPlayer::OGA; + // MP3 seems to be better supported everywhere + return Wt::WMediaPlayer::MP3; } AudioMediaPlayer::AudioMediaPlayer(Wt::WMediaPlayer::Encoding encoding, Wt::WContainerWidget *parent)