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

Switched default encoding to MP3, seems to be better supported

Browse Source
This commit is contained in:
emeric
2015-04-06 17:46:01 +02:00
parent c14da64d56
commit 43211d8aee
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/audio/desktop/AudioMediaPlayer.cpp
+2 -8
View File
@@ -23,8 +23,6 @@
#include <Wt/WTemplate> #include <Wt/WTemplate>
#include <Wt/WHBoxLayout> #include <Wt/WHBoxLayout>
#include <Wt/WVBoxLayout> #include <Wt/WVBoxLayout>
#include <Wt/WApplication>
#include <Wt/WEnvironment>
#include "AudioMediaPlayer.hpp" #include "AudioMediaPlayer.hpp"
@@ -34,12 +32,8 @@ namespace Desktop {
Wt::WMediaPlayer::Encoding Wt::WMediaPlayer::Encoding
AudioMediaPlayer::getBestEncoding() AudioMediaPlayer::getBestEncoding()
{ {
const Wt::WEnvironment& env = Wt::WApplication::instance()->environment(); // MP3 seems to be better supported everywhere
return Wt::WMediaPlayer::MP3;
if (env.agentIsIE())
return Wt::WMediaPlayer::MP3;
else
return Wt::WMediaPlayer::OGA;
} }
AudioMediaPlayer::AudioMediaPlayer( Wt::WMediaPlayer::Encoding encoding, Wt::WContainerWidget *parent) AudioMediaPlayer::AudioMediaPlayer( Wt::WMediaPlayer::Encoding encoding, Wt::WContainerWidget *parent)
src/ui/audio/mobile/MobileAudioMediaPlayer.cpp
+2 -8
View File
@@ -17,8 +17,6 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>. * along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Wt/WApplication>
#include <Wt/WEnvironment>
#include "MobileAudioMediaPlayer.hpp" #include "MobileAudioMediaPlayer.hpp"
@@ -30,12 +28,8 @@ namespace Mobile {
Wt::WMediaPlayer::Encoding Wt::WMediaPlayer::Encoding
AudioMediaPlayer::getBestEncoding() AudioMediaPlayer::getBestEncoding()
{ {
const Wt::WEnvironment& env = Wt::WApplication::instance()->environment(); // MP3 seems to be better supported everywhere
return Wt::WMediaPlayer::MP3;
if (env.agentIsIE())
return Wt::WMediaPlayer::MP3;
else
return Wt::WMediaPlayer::OGA;
} }
AudioMediaPlayer::AudioMediaPlayer(Wt::WMediaPlayer::Encoding encoding, Wt::WContainerWidget *parent) AudioMediaPlayer::AudioMediaPlayer(Wt::WMediaPlayer::Encoding encoding, Wt::WContainerWidget *parent)