Permalink
Browse files

Merge remote-tracking branch 'xbmc/Frodo' into frodo

  • Loading branch information...
2 parents b1e2cc0 + 0d373cc commit 35e61b71b6cd26babe20ffa7d0afb1a0e64b8c3e @tru tru committed Mar 18, 2013
View
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([xbmc], [12.0], [http://trac.xbmc.org])
+AC_INIT([xbmc], [12.1], [http://trac.xbmc.org])
AC_CONFIG_HEADERS([xbmc/config.h])
AH_TOP([#pragma once])
m4_include([m4/ax_python_devel.m4])
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -2,8 +2,8 @@
<!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.xbmc.xbmc"
- android:versionCode="6"
- android:versionName="12.0" >
+ android:versionCode="7"
+ android:versionName="12.1" >
<!-- This is the platform API where NativeActivity was introduced. -->
<uses-sdk android:minSdkVersion="9" />
@@ -44,7 +44,7 @@ fi
PACKAGE=org.xbmc.xbmc-atv2
-VERSION=12.0
+VERSION=12.1
REVISION=0
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
@@ -45,7 +45,7 @@ fi
PACKAGE=org.xbmc.xbmc-ios
-VERSION=12.0
+VERSION=12.1
REVISION=0
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
View
@@ -3,6 +3,6 @@
<!-- RSS feeds. To have multiple feeds, just add a feed to the set. You can also have multiple sets. !-->
<!-- To use different sets in your skin, each must be called from skin with a unique id. !-->
<set id="1">
- <feed updateinterval="30">http://feeds.feedburner.com/xbmc</feed>
+ <feed updateinterval="30">http://feeds.xbmc.org/xbmc</feed>
</set>
</rssfeeds>
View
@@ -508,7 +508,7 @@ namespace INFO
#define CONTROL_HAS_FOCUS 30000
#define VERSION_MAJOR 12
-#define VERSION_MINOR 0
+#define VERSION_MINOR 1
#define VERSION_TAG ""
#define LISTITEM_START 35000
View
@@ -126,7 +126,7 @@ namespace XbmcCommons
* it's own indexing.
*/
inline Buffer(const Buffer& buf) : bufferRef(buf.bufferRef), buffer(buf.buffer),
- mposition(buf.mposition), mcapacity(buf.mcapacity), mlimit(mlimit) { }
+ mposition(buf.mposition), mcapacity(buf.mcapacity), mlimit(buf.mlimit) { }
inline ~Buffer() { }
@@ -29,7 +29,13 @@
#include <string.h>
CAEEncoderFFmpeg::CAEEncoderFFmpeg():
- m_CodecCtx(NULL)
+ m_CodecCtx (NULL ),
+ m_BitRate (0 ),
+ m_BufferSize (0 ),
+ m_OutputSize (0 ),
+ m_OutputRatio (0.0 ),
+ m_SampleRateMul (0.0 ),
+ m_NeededFrames (0 )
{
}
@@ -1098,7 +1098,8 @@ m_allowMixing (false ),
m_encoded (false ),
m_initVolume (1.0f ),
m_NumLatencyFrames (0 ),
-m_OutputBufferIndex (0 )
+m_OutputBufferIndex (0 ),
+m_ae (NULL )
{
}
@@ -45,7 +45,8 @@ CCoreAudioAEHALOSX::CCoreAudioAEHALOSX() :
m_encoded (false ),
m_initVolume (1.0f ),
m_NumLatencyFrames (0 ),
- m_OutputBufferIndex (0 )
+ m_OutputBufferIndex (0 ),
+ m_ae (NULL )
{
m_AudioDevice = new CCoreAudioDevice();
m_OutputStream = new CCoreAudioStream();
@@ -81,6 +81,7 @@ CPulseAE::CPulseAE()
m_Context = NULL;
m_MainLoop = NULL;
m_muted = false;
+ m_Volume = 0.0f;
}
CPulseAE::~CPulseAE()
@@ -34,9 +34,11 @@ CPulseAESound::CPulseAESound(const std::string &filename, pa_context *context, p
m_context (context ),
m_mainLoop (mainLoop),
m_stream (NULL ),
- m_op (NULL )
+ m_op (NULL ),
+ m_maxVolume (0.0f ),
+ m_volume (0.0f ),
+ m_pulseName (StringUtils::CreateUUID())
{
- m_pulseName = StringUtils::CreateUUID();
m_wavLoader.Load(filename);
}
@@ -131,6 +131,12 @@ void CPlayerSelectionRule::GetPlayers(const CFileItem& item, VECPLAYERCORES &vec
CStreamDetails streamDetails = item.GetVideoInfoTag()->m_streamDetails;
if (CompileRegExp(m_audioCodec, regExp) && !MatchesRegExp(streamDetails.GetAudioCodec(), regExp)) return;
+
+ std::stringstream itoa;
+ itoa << streamDetails.GetAudioChannels();
+ CStdString audioChannelsstr = itoa.str();
+
+ if (CompileRegExp(m_audioChannels, regExp) && !MatchesRegExp(audioChannelsstr, regExp)) return;
if (CompileRegExp(m_videoCodec, regExp) && !MatchesRegExp(streamDetails.GetVideoCodec(), regExp)) return;
View
@@ -31,6 +31,7 @@ extern "C"
#endif
bool DarwinIsAppleTV2(void);
bool DarwinHasRetina(void);
+ const char *GetDarwinOSReleaseString(void);
const char *GetDarwinVersionString(void);
float GetIOSVersion(void);
int GetDarwinFrameworkPath(bool forPython, char* path, uint32_t *pathsize);
View
@@ -148,6 +148,20 @@ bool DarwinHasRetina(void)
return (platform >= iPhone4);
}
+const char *GetDarwinOSReleaseString(void)
+{
+ static std::string osreleaseStr;
+ if (osreleaseStr.empty())
+ {
+ size_t size;
+ sysctlbyname("kern.osrelease", NULL, &size, NULL, 0);
+ char *osrelease = new char[size];
+ sysctlbyname("kern.osrelease", osrelease, &size, NULL, 0);
+ osreleaseStr = osrelease;
+ delete [] osrelease;
+ }
+ return osreleaseStr.c_str();
+}
const char *GetDarwinVersionString(void)
{
View
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>XBMC</string>
<key>CFBundleGetInfoString</key>
- <string>12.0</string>
+ <string>12.1</string>
<key>CFBundleIconFile</key>
<string>xbmc.icns</string>
<key>CFBundleIdentifier</key>
@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>12.0</string>
+ <string>12.1</string>
<key>CFBundleVersion</key>
<string>r####</string>
<key>CFBundleSignature</key>
@@ -634,6 +634,10 @@ CStdString CSysInfo::GetUnameVersion()
result += name.release;
result += " ";
result += name.machine;
+#elif defined(TARGET_DARWIN_IOS)
+ result = GetDarwinOSReleaseString();
+ result += ", ";
+ result += GetDarwinVersionString();
#else
FILE* pipe = popen("uname -rm", "r");
if (pipe)
View
@@ -53,8 +53,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,9,1,0
- PRODUCTVERSION 11,9,1,0
+ FILEVERSION 12,1,0,0
+ PRODUCTVERSION 12,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Team XBMC"
VALUE "FileDescription", "XBMC"
- VALUE "FileVersion", "12.0"
+ VALUE "FileVersion", "12.1"
VALUE "InternalName", "XBMC.exe"
VALUE "LegalCopyright", "Copyright (c) Team XBMC. All rights reserved."
VALUE "OriginalFilename", "XBMC.exe"
VALUE "ProductName", "XBMC for Windows"
- VALUE "ProductVersion", "12.0"
+ VALUE "ProductVersion", "12.1"
END
END
BLOCK "VarFileInfo"

0 comments on commit 35e61b7

Please sign in to comment.