Skip to content
Browse files

Merge remote branch 'upstream-ro/Eden' into Eden-pvr

  • Loading branch information...
2 parents a62f4d4 + f119e6a commit cbe2cf352e924e02ad6ca756a516209c55ce38ed @opdenkamp committed
View
BIN media/Splash.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
3 xbmc/Application.cpp
@@ -1241,6 +1241,7 @@ bool CApplication::Initialize()
#ifdef HAS_JSONRPC
CJSONRPC::Initialize();
#endif
+ ADDON::CAddonMgr::Get().StartServices(false);
g_windowManager.ActivateWindow(g_SkinInfo->GetFirstWindow());
}
@@ -1285,7 +1286,7 @@ bool CApplication::Initialize()
CCrystalHD::GetInstance();
#endif
- CAddonMgr::Get().StartServices(false);
+ CAddonMgr::Get().StartServices(true);
CLog::Log(LOGNOTICE, "initialize done");
View
16 xbmc/cores/AudioRenderers/ALSADirectSound.cpp
@@ -60,17 +60,8 @@ bool CALSADirectSound::Initialize(IAudioCallback* pCallback, const CStdString& d
PCM_FRONT_CENTER, PCM_LOW_FREQUENCY,
PCM_SIDE_LEFT , PCM_SIDE_RIGHT
};
- static enum PCMChannels HDMIChannelMap[] = { PCM_FRONT_LEFT, PCM_FRONT_RIGHT
- , PCM_FRONT_CENTER, PCM_LOW_FREQUENCY
- , PCM_BACK_LEFT, PCM_BACK_RIGHT
- , PCM_FRONT_LEFT_OF_CENTER, PCM_FRONT_RIGHT_OF_CENTER
- , PCM_BACK_CENTER, PCM_SIDE_LEFT, PCM_SIDE_RIGHT};
- CStdString deviceuse(device);
-
- enum PCMChannels *output_map = ALSAChannelMap;
- if((deviceuse + ":").Left(5) == "hdmi:")
- output_map = HDMIChannelMap;
+ CStdString deviceuse;
/* setup the channel mapping */
m_uiDataChannels = iChannels;
@@ -85,7 +76,7 @@ bool CALSADirectSound::Initialize(IAudioCallback* pCallback, const CStdString& d
while(outLayout[ch] != PCM_INVALID)
{
for(map = 0; map < 8; ++map)
- if (outLayout[ch] == output_map[map])
+ if (outLayout[ch] == ALSAChannelMap[map])
{
if (map > outChannels)
outChannels = map;
@@ -94,7 +85,7 @@ bool CALSADirectSound::Initialize(IAudioCallback* pCallback, const CStdString& d
++ch;
}
- m_remap.SetOutputFormat(++outChannels, output_map);
+ m_remap.SetOutputFormat(++outChannels, ALSAChannelMap);
if (m_remap.CanRemap())
{
iChannels = outChannels;
@@ -136,6 +127,7 @@ bool CALSADirectSound::Initialize(IAudioCallback* pCallback, const CStdString& d
snd_config_update();
snd_config_t *config = snd_config;
+ deviceuse = device;
nErr = snd_config_copy(&config, snd_config);
CHECK_ALSA_RETURN(LOGERROR,"config_copy",nErr);
View
2 xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
@@ -65,7 +65,9 @@ static void LoadTexture(GLenum target
int bytesPerPixel;
switch (externalFormat)
{
+#ifndef HAS_GLES
case GL_BGRA:
+#endif
case GL_RGBA:
bytesPerPixel = 4;
break;
View
4 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
@@ -101,7 +101,9 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx
}
#endif
#ifdef HAVE_LIBVA
- if(*cur == PIX_FMT_VAAPI_VLD && g_guiSettings.GetBool("videoplayer.usevaapi"))
+ // mpeg4 vaapi decoding is disabled
+ if(*cur == PIX_FMT_VAAPI_VLD && g_guiSettings.GetBool("videoplayer.usevaapi")
+ && (avctx->codec_id != CODEC_ID_MPEG4 || g_advancedSettings.m_videoAllowMpeg4VAAPI))
{
VAAPI::CDecoder* dec = new VAAPI::CDecoder();
if(dec->Open(avctx, *cur))
View
12 xbmc/interfaces/AnnouncementManager.cpp
@@ -39,12 +39,18 @@ vector<IAnnouncer *> CAnnouncementManager::m_announcers;
void CAnnouncementManager::AddAnnouncer(IAnnouncer *listener)
{
+ if (!listener)
+ return;
+
CSingleLock lock (m_critSection);
m_announcers.push_back(listener);
}
void CAnnouncementManager::RemoveAnnouncer(IAnnouncer *listener)
{
+ if (!listener)
+ return;
+
CSingleLock lock (m_critSection);
for (unsigned int i = 0; i < m_announcers.size(); i++)
{
@@ -78,6 +84,12 @@ void CAnnouncementManager::Announce(EAnnouncementFlag flag, const char *sender,
void CAnnouncementManager::Announce(EAnnouncementFlag flag, const char *sender, const char *message, CFileItemPtr item, CVariant &data)
{
+ if (!item.get())
+ {
+ Announce(flag, sender, message, data);
+ return;
+ }
+
// Extract db id of item
CVariant object = data.isNull() || data.isObject() ? data : CVariant::VariantTypeObject;
CStdString type;
View
16 xbmc/linux/PosixMountProvider.cpp
@@ -101,14 +101,26 @@ std::vector<CStdString> CPosixMountProvider::GetDiskUsage()
#elif defined(__FreeBSD__)
FILE* pipe = popen("df -h -t ufs,cd9660,hfs,udf,zfs", "r");
#else
- FILE* pipe = popen("df -hx tmpfs", "r");
+ FILE* pipe = popen("df -h", "r");
#endif
+
+ static const char* excludes[] = {"rootfs","devtmpfs","tmpfs","none","/dev/loop", "udev", NULL};
if (pipe)
{
while (fgets(line, sizeof(line) - 1, pipe))
{
- result.push_back(line);
+ bool ok=true;
+ for (int i=0;excludes[i];++i)
+ {
+ if (strstr(line,excludes[i]))
+ {
+ ok=false;
+ break;
+ }
+ }
+ if (ok)
+ result.push_back(line);
}
pclose(pipe);
}
View
2 xbmc/settings/AdvancedSettings.cpp
@@ -93,6 +93,7 @@ void CAdvancedSettings::Initialize()
m_videoEnableHighQualityHwScalers = false;
m_videoAutoScaleMaxFps = 30.0f;
m_videoAllowMpeg4VDPAU = false;
+ m_videoAllowMpeg4VAAPI = false;
m_videoDisableBackgroundDeinterlace = false;
m_videoCaptureUseOcclusionQuery = -1; //-1 is auto detect
m_DXVACheckCompatibility = false;
@@ -467,6 +468,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
XMLUtils::GetBoolean(pElement,"enablehighqualityhwscalers", m_videoEnableHighQualityHwScalers);
XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f);
XMLUtils::GetBoolean(pElement,"allowmpeg4vdpau",m_videoAllowMpeg4VDPAU);
+ XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI);
XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace);
XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1);
View
1 xbmc/settings/AdvancedSettings.h
@@ -123,6 +123,7 @@ class CAdvancedSettings
bool m_videoEnableHighQualityHwScalers;
float m_videoAutoScaleMaxFps;
bool m_videoAllowMpeg4VDPAU;
+ bool m_videoAllowMpeg4VAAPI;
std::vector<RefreshOverride> m_videoAdjustRefreshOverrides;
bool m_videoDisableBackgroundDeinterlace;
int m_videoCaptureUseOcclusionQuery;
View
3 xbmc/settings/Settings.cpp
@@ -57,7 +57,6 @@
#include "utils/URIUtils.h"
#include "input/MouseStat.h"
#include "filesystem/File.h"
-#include "addons/AddonManager.h"
using namespace std;
using namespace XFILE;
@@ -985,8 +984,6 @@ bool CSettings::LoadProfile(unsigned int index)
CUtil::DeleteMusicDatabaseDirectoryCache();
CUtil::DeleteVideoDatabaseDirectoryCache();
- ADDON::CAddonMgr::Get().StartServices(false);
-
return true;
}
View
5 xbmc/settings/Settings.h
@@ -23,6 +23,11 @@
#define PRE_SKIN_VERSION_9_10_COMPATIBILITY 1
#define PRE_SKIN_VERSION_11_COMPATIBILITY 1
+//FIXME - after eden - make that one nicer somehow...
+#if defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2)
+#include "system.h" //for HAS_SKIN_TOUCHED
+#endif
+
#if defined(HAS_SKIN_TOUCHED) && defined(TARGET_DARWIN_IOS) && !defined(TARGET_DARWIN_IOS_ATV2)
#define DEFAULT_SKIN "skin.touched"
#else
View
8 xbmc/windowing/WinEventsSDL.cpp
@@ -65,8 +65,8 @@ static uint16_t SymMappingsEvdev[][2] =
, { 127, XBMCK_SPACE } // Pause
, { 135, XBMCK_MENU } // Right click
, { 136, XBMCK_MEDIA_STOP } // Stop
-, { 138, 0x49 /* 'I' */} // Info
-, { 147, 0x4d /* 'M' */} // Menu
+, { 138, 0x69 /* 'i' */} // Info
+, { 147, 0x6d /* 'm' */} // Menu
, { 148, XBMCK_LAUNCH_APP2 } // Launch app 2
, { 150, 0x9f } // Sleep
, { 152, XBMCK_LAUNCH_APP1 } // Launch app 1
@@ -78,13 +78,13 @@ static uint16_t SymMappingsEvdev[][2] =
, { 172, XBMCK_MEDIA_PLAY_PAUSE } // Play_Pause
, { 173, XBMCK_MEDIA_PREV_TRACK } // Prev track
, { 174, XBMCK_MEDIA_STOP } // Stop
-, { 176, 0x52 /* 'R' */} // Rewind
+, { 176, 0x72 /* 'r' */} // Rewind
, { 179, XBMCK_LAUNCH_MEDIA_SELECT } // Launch media select
, { 180, XBMCK_BROWSER_HOME } // Browser home
, { 181, XBMCK_BROWSER_REFRESH } // Browser refresh
, { 214, XBMCK_ESCAPE } // Close
, { 215, XBMCK_MEDIA_PLAY_PAUSE } // Play_Pause
-, { 216, 0x46 /* 'F' */} // Forward
+, { 216, 0x66 /* 'f' */} // Forward
//, {167, 0xb3 } // Record
};
View
2 xbmc/windows/GUIMediaWindow.cpp
@@ -1416,7 +1416,7 @@ void CGUIMediaWindow::GetContextButtons(int itemNumber, CContextButtons &buttons
// TODO: FAVOURITES Conditions on masterlock and localisation
if (!item->IsParentFolder() && !item->GetPath().Equals("add") && !item->GetPath().Equals("newplaylist://") &&
- !item->GetPath().Left(19).Equals("newsmartplaylist://") && !item->IsAddonsPath())
+ !item->GetPath().Left(19).Equals("newsmartplaylist://"))
{
if (CFavourites::IsFavourite(item.get(), GetID()))
buttons.Add(CONTEXT_BUTTON_ADD_FAVOURITE, 14077); // Remove Favourite
View
3 xbmc/windows/GUIWindowLoginScreen.cpp
@@ -45,6 +45,7 @@
#include "settings/GUISettings.h"
#include "FileItem.h"
#include "guilib/LocalizeStrings.h"
+#include "addons/AddonManager.h"
#define CONTROL_BIG_LIST 52
#define CONTROL_LABEL_HEADER 2
@@ -296,6 +297,8 @@ void CGUIWindowLoginScreen::LoadProfile(unsigned int profile)
JSONRPC::CJSONRPC::Initialize();
#endif
+ ADDON::CAddonMgr::Get().StartServices(false);
+
g_windowManager.ChangeActiveWindow(g_SkinInfo->GetFirstWindow());
g_application.UpdateLibraries();

0 comments on commit cbe2cf3

Please sign in to comment.
Something went wrong with that request. Please try again.