<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0adc171ae1326fc18ea25999196734a6a1eebe4c">https://github.com/macports/macports-ports/commit/0adc171ae1326fc18ea25999196734a6a1eebe4c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0adc171 XBMC: delete obsolete port
</span>0adc171 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0adc171ae1326fc18ea25999196734a6a1eebe4c
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sun Apr 9 02:05:14 2017 +0000
<span style='display:block; white-space:pre;color:#404040;'> XBMC: delete obsolete port
</span>---
multimedia/XBMC/Portfile | 109 -----
multimedia/XBMC/files/bf1.patch | 700 -------------------------------
multimedia/XBMC/files/nobundlelibs.patch | 13 -
multimedia/XBMC/files/preflight.patch | 22 -
multimedia/XBMC/files/statfs.patch | 13 -
5 files changed, 857 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XBMC/Portfile b/multimedia/XBMC/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9de8424..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/XBMC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,109 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcode 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#set svn_revision 16965
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name XBMC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.10bf1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories multimedia
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description XBMC Multimedia Center
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Formerly known as the XBox Multimedia Center, XBMC has been ported for use on UNIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.xbmc.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:xbmc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jam \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jasper \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:faac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/mysql_config5:mysql5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fribidi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lzo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:glew \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bzip2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_image \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_mixer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:samba3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:enca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-8.10.src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 2d20d255a211223eaa47f1c6bcf4be8e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 dc02511478ab5288e417a5d9655388007e00f325 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c4c5f12716ca2ce1544d2ac16f7427a2f20794b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set worksrcdir XBMC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#set worksrcdir XBMC-${svn_revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if {[file exists "${distpath}/XBMC"]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# delete "${distpath}/XBMC"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if {![file exists "${distpath}/XBMC-${svn_revision}"]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# system "mkdir -p \"${distpath}\" >& /dev/null && cd \"${distpath}\" && svn export --revision ${svn_revision} http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC && mv XBMC XBMC-${svn_revision}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#checksum { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if {[file exists "${worksrcpath}"]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# delete "${worksrcpath}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# system "cp -vR ${distpath}/XBMC-${svn_revision} ${worksrcpath}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles bf1.patch statfs.patch preflight.patch nobundlelibs.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # XBMC's tarballs have no exec perms on files and their SVN is flooded with bad perms...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # find . -type f -perm 755 | sed -e '/\.[Hchms]$/d' -e '/\.mm$/d' -e '/\.strings$/d' -e '/\.rtf$/d' -e '/\.txt$/d' -e '/Makefile$/d' -e '/\.psd$/d' -e '/\.xpm$/d' -e '/\.doc$/d' -e '/\.def$/d' -e '/\.prjm$/d' -e '/\.pcg$/d' -e '/\.cpp$/d' -e '/\.in$/d' -e '/\.conf$/d' -e '/\.wav$/d' -e '/\.nib$/d' -e '/\.plist$/d' -e '/\.xib$/d' -e '/\.pbxproj$/d' -e '/\.xbm$/d' -e '/\.xml$/d' -e '/\.java$/d' | sed -e 's: :\\\\ :g' | xargs echo | pbcopy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach needsexec [list ./build.sh ./config.guess ./config.sub ./configure ./guilib/freetype2/freetype221.lib ./guilib/freetype2/freetype221_D.lib ./install-sh ./scripts/autoexec.py ./system/cdrip/lame_enc-i486-linux.so ./system/cdrip/lame_enc-osx.so ./system/cdrip/ogg-i486-linux.so ./system/cdrip/vorbis-i486-linux.so ./system/cdrip/vorbisenc-i486-linux.so ./system/ImageLib-osx.so ./system/libcurl-osx.so ./system/libexif-osx.so ./system/libid3tag-osx.so ./system/players/dvdplayer/liba52 [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod 755 '${worksrcpath}/${needsexec}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.project XBMC.xcodeproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#xcode.configuration Debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.configuration Release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.build.settings -parallelizeTargets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#xcode.target XBMC.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Spaces make puppies cry
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #xcode.target "build XBMCHelper"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd \"${worksrcpath}\" && ${xcodebuildcmd} -project ${xcode.project} -target \"build XBMCHelper\" -configuration ${xcode.configuration} build OBJROOT=build/ SYMROOT=build/ ${xcode.build.settings}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xcode.target XBMC.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd \"${worksrcpath}\" && ${xcodebuildcmd} -project ${xcode.project} -target \"${xcode.target}\" -configuration ${xcode.configuration} build OBJROOT=build/ SYMROOT=build/ ${xcode.build.settings}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set resource_dir ${destroot}${applications_dir}/XBMC.app/Contents/Resources/XBMC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -o root -g admin -m 755 "${destroot}${applications_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "rsync --archive --verbose ${worksrcpath}/build/${xcode.configuration}/XBMC.app ${destroot}${applications_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Everything isn't copied by the XBMC.app target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${resource_dir}/skin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir "screensavers scripts skin sounds visualisations" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "rsync --archive --verbose ${worksrcpath}/${dir} ${resource_dir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XBMC/files/bf1.patch b/multimedia/XBMC/files/bf1.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3da6f50..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/XBMC/files/bf1.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,700 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/system/scrapers/video/ofdb.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- system/scrapers/video/ofdb.xml (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ system/scrapers/video/ofdb.xml (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,23 +122,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </RegExp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!--URL to IMDB-->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <RegExp input="$$1" output="<url function="IMDB-Details">http://german.imdb.com/title/tt\1/</url>" dest="5+">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <expression>http://german.imdb.com/Title\?([0-9]+)</expression>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <RegExp input="$$1" output="<url function="IMDB-Details">http://www.imdb.com/title/tt\2/</url>" dest="5+">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <expression>(imdb.com/)Title\?([0-9]+)</expression>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </RegExp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!--URL to IMDBcredits-->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <RegExp input="$$1" output="<url function="GetMovieCast">http://german.imdb.com/title/tt\1/fullcredits#cast</url>" dest="5+">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <expression>http://german.imdb.com/Title\?([0-9]+)</expression>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <RegExp input="$$1" output="<url function="GetMovieCast">http://www.imdb.com/title/tt\2/fullcredits#cast</url>" dest="5+">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <expression>(imdb.com/)Title\?([0-9]+)</expression>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </RegExp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!--URL to Fanart-->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <RegExp conditional="fanart" input="$$1" output="<url function="GetFanart">http://api.themoviedb.org/backdrop.php?imdb=tt\1</url>" dest="5+">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <expression>http://german.imdb.com/Title\?([0-9]+)</expression>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <RegExp conditional="fanart" input="$$1" output="<url function="GetFanart">http://api.themoviedb.org/backdrop.php?imdb=tt\2</url>" dest="5+">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <expression>(imdb.com/)Title\?([0-9]+)</expression>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </RegExp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!--URL to MoviePosterDB -->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <RegExp conditional="movieposterdb" input="$$1" output="<url function="GetMoviePosterDBLink">http://www.movieposterdb.com/browse/search?title=\1</url>" dest="5+">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <expression>http://german.imdb.com/Title\?([0-9]+)</expression>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <RegExp conditional="movieposterdb" input="$$1" output="<url function="GetMoviePosterDBLink">http://www.movieposterdb.com/browse/search?title=\2</url>" dest="5+">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <expression>(imdb.com/)Title\?([0-9]+)</expression>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </RegExp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!-- Ofdb Poster -->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/XBMC.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- XBMC.xcodeproj/project.pbxproj (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ XBMC.xcodeproj/project.pbxproj (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5838,7 +5838,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- runOnlyForDeploymentPostprocessing = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shellPath = /bin/sh;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- shellScript = "# Update version in Info.plist with SVN revision\nSVN_REVISION=\"8.10-b1\"\nSVNVERSION=\"\"\nBUNDLE_NAME=\"XBMC\"\n\n# only check for macports subversion or collab.net's svn\n# since OS X's bundled subversion client is too old\n# http://www.collab.net/downloads/community/\nif [ -x /opt/local/bin/svnversion ]; then\n\tSVVERSION=\"/opt/local/bin/svnversion\"\nelif [ -x /opt/subversion/bin/svnversion ]; then\n\tSVNVERSION=\"/opt/subversion/bin/svnversion\"\nfi\n\n# we che [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ shellScript = "# Update version in Info.plist with SVN revision\nSVN_REVISION=\"8.10-bf1\"\nSVNVERSION=\"\"\nBUNDLE_NAME=\"XBMC\"\n\n# only check for macports subversion or collab.net's svn\n# since OS X's bundled subversion client is too old\n# http://www.collab.net/downloads/community/\nif [ -x /opt/local/bin/svnversion ]; then\n\tSVVERSION=\"/opt/local/bin/svnversion\"\nelif [ -x /opt/subversion/bin/svnversion ]; then\n\tSVNVERSION=\"/opt/subversion/bin/svnversion\"\nfi\n\n# we ch [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 882630930E1B6FAD00DC9524 /* ShellScript */ = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- isa = PBXShellScriptBuildPhase;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6831,7 +6831,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "_FILE_OFFSET_BITS=64",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _LARGEFILE64_SOURCE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAS_SDL_JOYSTICK,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1 = "VERSION_STRING='\"8.10 bf1:ATLANTIS\"'";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_SYMBOLS_PRIVATE_EXTERN = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GCC_UNROLL_LOOPS = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HEADER_SEARCH_PATHS = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/Util.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/Util.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/Util.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -837,6 +837,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (strProtocol == "cdda" || strProtocol == "iso9660") return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (strProtocol == "special") return IsRemote(TranslateSpecialPath(strFile));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (strProtocol.Left(3) == "mem") return false; // memory cards
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (strProtocol == "stack") return IsRemote(CStackDirectory::GetFirstStackedFile(strFile));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (strProtocol == "virtualpath")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { // virtual paths need to be checked separately
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CVirtualPathDirectory dir;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/ApplicationMessenger.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/ApplicationMessenger.h (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/ApplicationMessenger.h (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,8 +126,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void ProcessMessage(ThreadMessage *pMsg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::vector<ThreadMessage*> m_vecMessages;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::vector<ThreadMessage*> m_vecWindowMessages;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::queue<ThreadMessage*> m_vecMessages;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::queue<ThreadMessage*> m_vecWindowMessages;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCriticalSection m_critSection;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCriticalSection m_critBuffer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CStdString bufferResponse;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -436,6 +436,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_ioContext)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(m_pFormatContext->pb && m_pFormatContext->pb != m_ioContext)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CLog::Log(LOGWARNING, "CDVDDemuxFFmpeg::Dispose - demuxer changed our byte context behind our back, possible memleak");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_ioContext = m_pFormatContext->pb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_dllAvFormat.av_close_input_stream(m_pFormatContext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_dllAvFormat.url_fclose(m_ioContext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -147,6 +147,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_pTarget->iDisplayHeight = m_pSource->iDisplayHeight;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_pTarget->iDisplayWidth = m_pSource->iDisplayWidth;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_pTarget->pts = m_pSource->pts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_pTarget->iGroupId = m_pSource->iGroupId;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/win32/XBMC_PC.rc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/win32/XBMC_PC.rc (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/win32/XBMC_PC.rc (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,8 +53,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VS_VERSION_INFO VERSIONINFO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FILEVERSION 2,1,0,0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PRODUCTVERSION 2,1,0,0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FILEVERSION 0,8,1,0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PRODUCTVERSION 0,8,1,0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILEFLAGSMASK 0x3fL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _DEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILEFLAGS 0x1L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,12 +71,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BEGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VALUE "CompanyName", "Team XBMC"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VALUE "FileDescription", "XBMC "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VALUE "FileVersion", "pre-2.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ VALUE "FileVersion", "8.10.bf1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VALUE "InternalName", "XBMC.exe"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VALUE "LegalCopyright", "CopyRight (c) Team XBMC. All rights reserved."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VALUE "OriginalFilename", "XBMC.exe"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VALUE "ProductName", "XBMC for Windows"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VALUE "ProductVersion", "pre-2.1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ VALUE "ProductVersion", "8.10.bf1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BLOCK "VarFileInfo"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/GUISettings.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/GUISettings.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/GUISettings.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -599,13 +599,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddString(3, "videoscreen.guicalibration",214,"", BUTTON_CONTROL_STANDARD);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddString(4, "videoscreen.testpattern",226,"", BUTTON_CONTROL_STANDARD);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AddInt(6, "videoscreen.vsync", 13105,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef _LINUX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VSYNC_DISABLED,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else /* _LINUX */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VSYNC_ALWAYS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* _LINUX */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- VSYNC_DISABLED, 1, VSYNC_DRIVER, SPIN_CONTROL_TEXT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AddInt(6, "videoscreen.vsync", 13105, VSYNC_ALWAYS, VSYNC_DISABLED, 1, VSYNC_DRIVER, SPIN_CONTROL_TEXT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddCategory(7, "filelists", 14018);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddBool(1, "filelists.hideparentdiritems", 13306, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/ApplicationMessenger.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/ApplicationMessenger.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/ApplicationMessenger.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,20 +53,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void CApplicationMessenger::Cleanup()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vector<ThreadMessage*>::iterator it = m_vecMessages.begin();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while (it != m_vecMessages.end())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (m_vecMessages.size() > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ThreadMessage* pMsg = *it;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ThreadMessage* pMsg = m_vecMessages.front();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete pMsg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- it = m_vecMessages.erase(it);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_vecMessages.pop();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- it = m_vecWindowMessages.begin();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while (it != m_vecWindowMessages.end())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (m_vecWindowMessages.size() > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ThreadMessage* pMsg = *it;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ThreadMessage* pMsg = m_vecWindowMessages.front();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete pMsg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- it = m_vecWindowMessages.erase(it);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_vecWindowMessages.pop();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,16 +96,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CSingleLock lock (m_critSection);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (msg->dwMessage == TMSG_DIALOG_DOMODAL ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- msg->dwMessage == TMSG_WRITE_SCRIPT_OUTPUT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_vecWindowMessages.push_back(msg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else m_vecMessages.push_back(msg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_vecWindowMessages.push(msg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_vecMessages.push(msg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lock.Leave();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (message.hWaitEvent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lock.Leave();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WaitForSingleObject(message.hWaitEvent, INFINITE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lock.Enter();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CloseHandle(message.hWaitEvent);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message.hWaitEvent = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,24 +115,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CSingleLock lock (m_critSection);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (m_vecMessages.size() > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vector<ThreadMessage*>::iterator it = m_vecMessages.begin();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ThreadMessage* pMsg = *it;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ThreadMessage* pMsg = m_vecMessages.front();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //first remove the message from the queue, else the message could be processed more then once
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- it = m_vecMessages.erase(it);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_vecMessages.pop();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //Leave here as the message might make another
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //thread call processmessages or sendmessage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lock.Leave();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ProcessMessage(pMsg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // lock again to make sure nothing happened to pMsg->hWaitEvent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lock.Enter();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ProcessMessage(pMsg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (pMsg->hWaitEvent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SetEvent(pMsg->hWaitEvent);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete pMsg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lock.Enter();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -540,25 +532,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CSingleLock lock (m_critSection);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //message type is window, process window messages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (m_vecWindowMessages.size() > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (m_vecWindowMessages.size() > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vector<ThreadMessage*>::iterator it = m_vecWindowMessages.begin();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while (it != m_vecWindowMessages.end())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ThreadMessage* pMsg = *it;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- //first remove the message from the queue, else the message could be processed more then once
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- it = m_vecWindowMessages.erase(it);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ThreadMessage* pMsg = m_vecWindowMessages.front();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //first remove the message from the queue, else the message could be processed more then once
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_vecWindowMessages.pop();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // leave here in case we make more thread messages from this one
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lock.Leave();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ProcessMessage(pMsg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (pMsg->hWaitEvent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SetEvent(pMsg->hWaitEvent);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // leave here in case we make more thread messages from this one
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lock.Leave();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- delete pMsg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // reenter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lock.Enter();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ProcessMessage(pMsg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (pMsg->hWaitEvent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SetEvent(pMsg->hWaitEvent);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete pMsg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lock.Enter();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/XBVideoConfig.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/XBVideoConfig.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/XBVideoConfig.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -327,7 +327,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_ResInfo[m_iNumResolutions].iSubtitles = (int)(0.9*h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(m_ResInfo[m_iNumResolutions].strMode,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sizeof(m_ResInfo[m_iNumResolutions].strMode),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "%d x %d (Full screen #%d)", w, h, i+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "%d x %d (Full Screen #%d)", w, h, i+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((float)w / (float)h >= 1.59)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_ResInfo[m_iNumResolutions].dwFlags = D3DPRESENTFLAG_WIDESCREEN;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/GUIWindowSettingsCategory.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/GUIWindowSettingsCategory.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/GUIWindowSettingsCategory.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,6 +116,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_pOriginalButton = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_pOriginalCategoryButton = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_pOriginalImage = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_pOriginalEdit = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // set the correct ID range...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_dwIDRange = 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_iScreen = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -893,7 +894,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (pControl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int value = g_guiSettings.GetInt("videoscreen.resolution");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (strstr(g_settings.m_ResInfo[value].strMode, "Full screen") != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (strstr(g_settings.m_ResInfo[value].strMode, "Full Screen") != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pControl->SetEnabled(true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pControl->SetEnabled(false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/FileSystem/cddb.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/FileSystem/cddb.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/FileSystem/cddb.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1206,9 +1206,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //##########################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Send the Hello message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( ! Send("cddb hello xbox xbox XboxMediaCenter pre-2.1"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( ! Send("cddb hello xbmc xbmc XBMC 8.10.bf1"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CLog::Log(LOGERROR, "Xcddb::queryCDinfo Error sending \"%s\"", "cddb hello xbox xbox XboxMediaCenter pre-2.1");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CLog::Log(LOGERROR, "Xcddb::queryCDinfo Error sending \"%s\"", "cddb hello xbmc xbmc XBMC 8.10");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_lastError = E_NETWORK_ERROR_SEND;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/FileSystem/FileCurl.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/FileSystem/FileCurl.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/FileSystem/FileCurl.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -389,7 +389,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_userAgent.length() > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_curlInterface.easy_setopt(h, CURLOPT_USERAGENT, m_userAgent.c_str());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else /* set some default agent as shoutcast doesn't return proper stuff otherwise */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_curlInterface.easy_setopt(h, CURLOPT_USERAGENT, "XBMC/pre-2.1 (compatible; MSIE 6.0; Windows NT 5.1; WinampMPEG/5.09)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_curlInterface.easy_setopt(h, CURLOPT_USERAGENT, "XBMC/8.10.bf1 (compatible; MSIE 6.0; Windows NT 5.1; WinampMPEG/5.09)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_useOldHttpVersion)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_curlInterface.easy_setopt(h, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/FileSystem/FileSmb.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/FileSystem/FileSmb.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/FileSystem/FileSmb.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -512,7 +512,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct stat info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CLog::Log(LOGDEBUG, "%s(%s)", __FUNCTION__, strFileName.c_str());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CSingleLock lock(smb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int iResult = smbc_stat(strFileName, &info);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/GUILargeTextureManager.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/GUILargeTextureManager.h (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/GUILargeTextureManager.h (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +104,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(m_texture == NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAS_SDL_OPENGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_texture = new CGLTexture(texture, false, true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (texture)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_texture = new CGLTexture(texture, false, true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_texture = NULL; // unable to load the textures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_texture = texture;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/NfoFile.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/NfoFile.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/NfoFile.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -166,7 +166,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (file.Open(strFile, true))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_size = (int)file.GetLength();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_doc = new char[m_size+1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_doc = new char[m_size+1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (...)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CLog::Log(LOGERROR, "%s: Exception while creating file buffer",__FUNCTION__);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return E_FAIL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!m_doc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file.Close();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/lib/libRTMP/rtmp.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/lib/libRTMP/rtmp.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/lib/libRTMP/rtmp.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -621,7 +621,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLog::Log(LOGDEBUG,"%s, onStatus: %s", __FUNCTION__, code.c_str() );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (code == "NetStream.Failed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- || code == "NetStream.Play.Failed")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || code == "NetStream.Play.Failed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || code == "NetStream.Play.Stop")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Close();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/osx/CocoaUtils.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/osx/CocoaUtils.m (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/osx/CocoaUtils.m (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,6 +116,45 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFNumberGetValue(CFDictionaryGetValue(mode, kCGDisplayHeight), kCFNumberSInt32Type, h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int Cocoa_GetScreenIndex(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // return one based screen index
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int screen_index = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int numDisplays = [[NSScreen screens] count];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSScreen* current_Screen = nil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (numDisplays > 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSOpenGLContext* context = (NSOpenGLContext*)Cocoa_GL_GetCurrentContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (context)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSView* view;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ view = [context view];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (view) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSWindow* window;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ window = [view window];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (window)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Get the screen we are using for display.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ current_Screen = [window screen];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (screen_index = 0; screen_index < numDisplays; screen_index++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (current_Screen == [[NSScreen screens] objectAtIndex:screen_index])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ screen_index++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return(screen_index);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void Cocoa_GetScreenResolution(int* w, int* h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Figure out the screen size. (default to main screen)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/osx/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/osx/Info.plist (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/osx/Info.plist (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,28 +1,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <plist version="1.0">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <key>CFBundleInfoDictionaryVersion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string>6.0</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleDevelopmentRegion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>English</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleExecutable</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>XBMC</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleGetInfoString</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string>8.10.b1</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>8.10.bf1</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleIconFile</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>xbmc.icns</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleIdentifier</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>com.teamxbmc.xbmc</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>CFBundleInfoDictionaryVersion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>6.0</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleName</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>XBMC</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundlePackageType</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>APPL</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleShortVersionString</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string>8.10-b1</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>8.10-bf1</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>CFBundleSignature</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>xbmc</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleVersion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>r####</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <key>CFBundleSignature</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string>xbmc</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </plist>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/osx/CocoaUtils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/osx/CocoaUtils.h (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/osx/CocoaUtils.h (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,6 +29,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Graphics.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int Cocoa_GetScreenIndex(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void Cocoa_GetScreenResolution(int* w, int* h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double Cocoa_GetScreenRefreshRate(int screen_id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void Cocoa_GetScreenResolutionOfAnotherScreen(int display, int* w, int* h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/GUIWindowMusicInfo.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/GUIWindowMusicInfo.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/GUIWindowMusicInfo.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -459,7 +459,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- item->SetIconImage("defaultPicture.png");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- item->GetVideoInfoTag()->m_strPictureURL.m_url.push_back(url.m_url[i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- item->SetLabel(g_localizeStrings.Get(415));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- item->SetProperty("labelonthumbload", g_localizeStrings.Get(20055));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ item->SetProperty("labelonthumbload", g_localizeStrings.Get(20015));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // make sure any previously cached thumb is removed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CFile::Exists(item->GetCachedPictureThumb()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFile::Delete(item->GetCachedPictureThumb());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/xbmc/utils/GUIInfoManager.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/utils/GUIInfoManager.h (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/utils/GUIInfoManager.h (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -393,10 +393,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define BUTTON_SCROLLER_HAS_ICON 30001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef SVN_REV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define VERSION_STRING "pre-8.10 SVN:"SVN_REV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef VERSION_STRING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define VERSION_STRING "8.10 SVN:"SVN_REV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define VERSION_STRING "pre-8.10"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef VERSION_STRING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define VERSION_STRING "8.10 bf1:ATLANTIS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LISTITEM_START 35000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LISTITEM_THUMB (LISTITEM_START)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/known_issues.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- known_issues.txt (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ known_issues.txt (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,30 +1,48 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Known Issues for 8.10 'Atlantis' Release of XBMC for Linux, Mac OS X and Windows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+--------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) There is no offloading of Video Decoding (commonly referred to as Hardware Acceleration) in XBMC at this time. This means that it takes powerful hardware to decode High Definition H.264 videos.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) There is no offloading of Video Decoding (commonly referred to as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Hardware Acceleration) in XBMC at this time. This means that it takes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ powerful hardware to decode High Definition H.264 videos.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) PulseAudio (Ubuntu component) causes various audio related problems for XBMC, so you might want to remove this component to be on the safe side.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) PulseAudio (Ubuntu component) causes various audio related problems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for XBMC, so you might want to disable this component to be on the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ safe side.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) 'Settings/Videos/Player/High Quality Software Upscaling' is not recommended to use with older IGP solutions/slow hardware, safest is to not enable it at all unless you are fully aware of what you're doing.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) 'Settings -> Videos -> Player -> High Quality Software Upscaling'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is not recommended for use with older IGP solutions/slow hardware.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Safest is to not enable it at all unless you are fully aware of what
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ you're doing.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) Intel GMA X3100 (GM965) and slower/older IGP's barely handle 1080p Display Output under Linux due to (what I pike suspect) poor drivers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) Intel GMA X3100 (GM965) and older IGPs have issues handling 1080p
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Display Output under Linux.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) Some H.264 encoded videos experiences blocking. It's currently believed this is related to the unapproved FFMpeg 'Cabac patch' we use to speedup (multithread) H.264 decoding.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) Some H.264 encoded videos exhibit video "blocking" artifacts. It's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ currently believed that this is related to the unapproved FFMpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'Cabac patch' we use to speedup (multithread) H.264 decoding.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) A running Screensaver behind Fullscreen XBMC on Linux can cause graphical glitches in XBMC.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) An active screensaver in Linux, behind XBMC running fullscreen, can
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cause graphical glitches.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) Compiz / Desktop Effects and XBMC does not mix well, atleast not without serious tweaking to Compiz.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) Compiz / Desktop Effects and XBMC do not mix well, atleast not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ without serious tweaking to Compiz.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) Eventclients are not to be considered stable in this release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) Event clients are not to be considered stable in this release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) Shoutcast/AAC streaming do not work correctly, it may re-buffer every ~30 secs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) Shoutcast/AAC streaming does not work correctly, it may re-buffer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ every 30 or so seconds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) Not all of XBMC's settings are active or do what they are supposed to.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) Not all of XBMC's settings are active or do what they are supposed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ to.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) "Rar sets" needs to be completely downloaded before XBMC can stream content from them.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) "Rar sets" needs to be completely downloaded before XBMC can stream
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ content from them.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) Not all the old xbox XBMC scripts work with Linux/OSX/Win ports. Some don't even work on XBOX anymore.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) Not all the old XBox XBMC scripts work with Linux/OS X/Win32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ports. Some don't even work on XBox anymore.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) XBMC crashing on Linux will sometimes lock the mousepointer (you need to restart XBMC and quit it again to release it).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) XBMC crashing on Linux will sometimes lock the mouse pointer. To fix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this, restart XBMC and quit it again to release it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*) Visualisations are less polished than other components and may cause various glitches, like resizing issues.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*) Visualisations are less polished than other components and may
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cause various glitches, like resizing issues.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/guilib/GraphicContext.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- guilib/GraphicContext.cpp (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ guilib/GraphicContext.cpp (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -615,6 +615,41 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (res==WINDOW || (m_Resolution != res))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // In going FullScreen, m_Resolution == DESKTOP but if using multiple displays
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // the display resolution will be wrong if the windowed display is moved to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // a display with a different resolution. So we have to resort to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Hack, hack, hack. The basic problem is the resolution is not linked to the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // display so we have to find which display we are going fs on, then search
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // through the m_ResInfo resolutions to find a matching "Full Screen"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // descriptor, then use that index to setup m_Resolution as there are multiple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // "DESKTOP" with multiple displays. If the strMode descriptor changes, this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // will break but the resolution really need to be linked to a display index.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (m_bFullScreenRoot)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // going to fullscreen desktop but which display if multiple displays?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // need to find the m_ResInfo index for that display.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int screen_index = Cocoa_GetScreenIndex();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char test_string[256];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (screen_index == 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcpy(test_string, "(Full Screen)");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sprintf(test_string, "(Full Screen #%d)", screen_index);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (int i = (int)DESKTOP ; i< (CUSTOM+g_videoConfig.GetNumberOfResolutions()) ; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (strstr(g_settings.m_ResInfo[i].strMode, test_string) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ res = (RESOLUTION)i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Lock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_iScreenWidth = g_settings.m_ResInfo[res].iWidth;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_iScreenHeight = g_settings.m_ResInfo[res].iHeight;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -926,6 +961,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_settings.m_ResInfo[res].iHeight,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_settings.m_ResInfo[res].fRefreshRate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_settings.m_ResInfo[res].iSubtitles = (int)(0.965 * g_settings.m_ResInfo[res].iHeight);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(g_settings.m_ResInfo[res].strMode, sizeof(g_settings.m_ResInfo[res].strMode),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "%dx%d (Full Screen)", g_settings.m_ResInfo[res].iWidth, g_settings.m_ResInfo[res].iHeight);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((float)g_settings.m_ResInfo[res].iWidth/(float)g_settings.m_ResInfo[res].iHeight >= fOptimalSwitchPoint)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1449,9 +1485,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ResetScreenParameters(m_Resolution);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_iFullScreenWidth = m_iScreenWidth= g_settings.m_ResInfo[m_Resolution].iWidth;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_iFullScreenHeight = m_iScreenHeight = g_settings.m_ResInfo[m_Resolution].iHeight;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cocoa_GL_SetFullScreen(m_iFullScreenWidth, m_iFullScreenHeight, true, blankOtherDisplays, g_advancedSettings.m_osx_GLFullScreen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(_WIN32PC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEVMODE settings;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/skin/PM3.HD/language/English/strings.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skin/PM3.HD/language/English/strings.xml (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skin/PM3.HD/language/English/strings.xml (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string id="31041">Current TV Show[CR]Fanart Image[CR][CR]Click to Change</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string id="31042">PLAYING</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string id="31043">PAUSED</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <string id="31044">FAST FOWARD</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string id="31044">FAST FORWARD</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string id="31045">REWIND</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string id="31046">Welcome to XBMC - Please Login</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string id="31047">Last Logged in</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC/skin/PM3.HD/language/German/strings.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skin/PM3.HD/language/German/strings.xml (.../tags/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skin/PM3.HD/language/German/strings.xml (.../branches/8.10_Atlantis-linux-osx-win32) (revision 17004)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!--Translator: T045T-->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!--Email: t045tbr0t@yahoo.de-->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!--Date of translation: 10/25/2008-->
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XBMC/files/nobundlelibs.patch b/multimedia/XBMC/files/nobundlelibs.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6af0b9d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/XBMC/files/nobundlelibs.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: XBMC.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- XBMC.xcodeproj/project.pbxproj (revision 16965)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ XBMC.xcodeproj/project.pbxproj (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5848,7 +5848,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- runOnlyForDeploymentPostprocessing = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shellPath = /bin/sh;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- shellScript = "mkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources\"\n\ncp -f \"$TARGET_BUILD_DIR/XBMC\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS/\"\ncp -f \"$SRCROOT/media/xbmc.icns\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\ncp -f \"$SRCROOT/xbmc/osx/Info.plist\" \"$TARGET_BUILD_DIR/$T [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ shellScript = "mkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources\"\n\ncp -f \"$TARGET_BUILD_DIR/XBMC\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS/\"\ncp -f \"$SRCROOT/media/xbmc.icns\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\ncp -f \"$SRCROOT/xbmc/osx/Info.plist\" \"$TARGET_BUILD_DIR/$T [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6E418A3D0E9EE93B009278E2 /* ShellScript */ = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- isa = PBXShellScriptBuildPhase;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XBMC/files/preflight.patch b/multimedia/XBMC/files/preflight.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 451d0ec..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/XBMC/files/preflight.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: xbmc/XboxMediaCenter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/XboxMediaCenter.cpp (revision 16965)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/XboxMediaCenter.cpp (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,7 +85,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // if we're on a Mac or if XBMC_PLATFORM_MODE is set, enable platform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // specific directories.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- system("XBMC.app/Contents/Resources/XBMC/tools/preflight");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(getenv("XBMC_HOME")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *preflight = (char *)malloc((strlen(getenv("XBMC_HOME")) + strlen("/tools/preflight") + 1) * sizeof(char));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(!preflight)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _exit(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcpy(preflight, getenv("XBMC_HOME"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ strcat(preflight, "/tools/preflight");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ system(preflight);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ system("XBMC.app/Contents/Resources/XBMC/tools/preflight");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (getenv("XBMC_PLATFORM_MODE"))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XBMC/files/statfs.patch b/multimedia/XBMC/files/statfs.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e5b5088..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/XBMC/files/statfs.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: xbmc/linux/PlatformDefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xbmc/linux/PlatformDefs.h (revision 16965)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xbmc/linux/PlatformDefs.h (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,7 +314,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _O_WRONLY O_WRONLY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _off_t off_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED < 1050
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define __stat64 stat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define stat64 stat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define statfs64 statfs
</span></pre><pre style='margin:0'>
</pre>