Permalink
Browse files

[rbp] added raspberrypi omxplayer

  • Loading branch information...
1 parent 18c401c commit a91e8749e76f61e2c24ee87c16bae375674f8476 @huceke committed Aug 10, 2012
View
@@ -143,6 +143,10 @@ ifeq (@USE_AMLPLAYER@,1)
DIRECTORY_ARCHIVES += xbmc/cores/amlplayer/amlplayer.a
endif
+ifeq (@USE_OMXPLAYER@,1)
+DIRECTORY_ARCHIVES += xbmc/cores/omxplayer/omxplayer.a
+endif
+
PAPCODECS_DIRS= \
lib/xbadpcm \
lib/nosefart \
View
@@ -40,6 +40,10 @@ ifneq (@USE_EXTERNAL_FFMPEG@,1)
endif
INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
+ifeq (@USE_OMXPLAYER@,1)
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/AudioEngine
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/AudioEngine/Utils
+endif
DEFINES+= \
@ARCH_DEFINES@ \
-D_FILE_DEFINED \
@@ -12,7 +12,7 @@ CONFIGURE=./configure --prefix=$(PREFIX) --build=$(BUILD) --host=$(HOST) \
--disable-optical-drive --disable-dvdcss --disable-joystick --disable-debug \
--disable-crystalhd --disable-vtbdecoder --disable-vaapi --disable-vdpau \
--disable-pulse --disable-projectm --with-platform=raspberry-pi --disable-optimizations \
- --enable-rpi-cec-api
+ --enable-rpi-cec-api --enable-player=omxplayer
all: configure
View
@@ -5428,6 +5428,10 @@ void CApplication::SetHardwareVolume(float hardwareVolume)
value = 1.0f;
CAEFactory::SetVolume(value);
+
+ /* for platforms where we do not have AE */
+ if (m_pPlayer)
+ m_pPlayer->SetVolume(g_settings.m_fVolumeLevel);
}
int CApplication::GetVolume() const
@@ -163,7 +163,9 @@ MsgQueueReturnCode CDVDMessageQueue::Get(CDVDMsg** pMsg, unsigned int iTimeoutIn
if(m_list.empty() && m_bEmptied == false && priority == 0 && m_owner != "teletext")
{
+#if !defined(TARGET_RASPBERRY_PI)
CLog::Log(LOGWARNING, "CDVDMessageQueue(%s)::Get - asked for new data packet, with nothing available", m_owner.c_str());
+#endif
m_bEmptied = true;
}
Oops, something went wrong.

0 comments on commit a91e874

Please sign in to comment.