'); + libraryContainer.attr('id', 'libraryContainer') + .addClass('contentContainer'); + $('#content').append(libraryContainer); jQuery.post(JSON_RPC + '?GetAlbums', '{"jsonrpc": "2.0", "method": "AudioLibrary.GetAlbums", "params": { "start": 0, "fields": ["album_description", "album_theme", "album_mood", "album_style", "album_type", "album_label", "album_artist", "album_genre", "album_rating", "album_title"] }, "id": 1}', jQuery.proxy(function(data) { if (data && data.result && data.result.albums) { - libraryContainer = $('

'); - libraryContainer.css('z-index', 100) - .attr('id', 'libraryContainer') - .addClass('contentContainer'); - $('#content').append(libraryContainer); + this.albumList = data.result.albums; + this.albumList.sort(jQuery.proxy(this.albumArtistSorter, this)); + $.each($(this.albumList), jQuery.proxy(function(i, item) { + var floatableAlbum = this.generateThumb('album', item.thumbnail, item.album_title, item.album_artist); + floatableAlbum.bind('click', { album: item }, jQuery.proxy(this.displayAlbumDetails, this)); + libraryContainer.append(floatableAlbum); + }, this)); + var footerPadding = $('

').addClass('footerPadding'); + libraryContainer.append(footerPadding); + $('#spinner').hide(); + //$('#libraryContainer img').lazyload(); + libraryContainer.bind('scroll', { activeLibrary: libraryContainer }, jQuery.proxy(this.updateScrollEffects, this)); + libraryContainer.trigger('scroll'); + myScroll = new iScroll('libraryContainer'); } else { libraryContainer.html(''); } - $.each($(data.result.albums), jQuery.proxy(function(i, item) { - var floatableAlbum = this.generateThumb('album', item.thumbnail, item.album_title, item.album_artist); - floatableAlbum.bind('click', { album: item }, jQuery.proxy(this.displayAlbumDetails, this)); - libraryContainer.append(floatableAlbum); - }, this)); - $('#spinner').hide(); - //$('#libraryContainer img').lazyload(); - libraryContainer.bind('scroll', { activeLibrary: libraryContainer }, jQuery.proxy(this.updateScrollEffects, this)); - libraryContainer.trigger('scroll'); }, this), 'json'); } else { - libraryContainer.css('z-index', 100); + libraryContainer.show(); libraryContainer.trigger('scroll'); } }, @@ -105,7 +109,54 @@ floatableAlbum.addClass(className).html('

' + code); return floatableAlbum; }, + showAlbumSelectorBlock: function(album) { + if (album) { + //Find album in stored array + var prevAlbum = null, + nextAlbum = null; + $.each($(this.albumList), jQuery.proxy(function(i, item) { + if (item.albumid == album.albumid) { + if (this.albumList.length > 1) { + if (i <= 0) { + prevAlbum = this.albumList[this.albumList.length-1]; + } else { + prevAlbum = this.albumList[i-1]; + } + if (i >= this.albumList.length) { + nextAlbum = this.albumList[0]; + } else { + nextAlbum = this.albumList[i+1]; + } + } + return false; /* .each break */ + } + }, this)); + var albumSelectorBlock = $('#albumSelector'); + if (!albumSelectorBlock || albumSelectorBlock.length == 0) { + albumSelectorBlock = $('

'); + albumSelectorBlock.attr('id', 'albumSelector') + .html('

All Albums

'); + $('#content').prepend(albumSelectorBlock); + $('#albumSelector .allAlbums').bind('click', jQuery.proxy(this.hideAlbumDetails, this)); + } + $('#albumSelector .prevAlbum').unbind(); + $('#albumSelector .nextAlbum').unbind(); + if (prevAlbum) { + $('#albumSelector .prevAlbum').bind('click', {album: prevAlbum}, jQuery.proxy(this.displayAlbumDetails, this)); + } + if (nextAlbum) { + $('#albumSelector .nextAlbum').bind('click', {album: nextAlbum}, jQuery.proxy(this.displayAlbumDetails, this)); + } + $('#albumSelector .activeAlbumTitle').html(album.album_title||'Unknown Album'); + albumSelectorBlock.show(); + } + }, + hideAlbumDetails: function() { + $('.contentContainer').hide(); + this.musicLibraryOpen(); + }, displayAlbumDetails: function(event) { + this.showAlbumSelectorBlock(event.data.album); var albumDetailsContainer = $('#albumDetails' + event.data.album.albumid); $('#topScrollFade').hide(); if (!albumDetailsContainer || albumDetailsContainer.length == 0) { @@ -114,63 +165,66 @@ albumDetailsContainer = $('

'); albumDetailsContainer.attr('id', 'albumDetails' + event.data.album.albumid) .addClass('contentContainer') - .css('z-index', 100) - .html('

Artwork		Name	Time	Artist	Genre

'); + .addClass('albumContainer') + .html('

Artwork		Name	Time	Artist	Genre

'); + $('.contentContainer').hide(); $('#content').append(albumDetailsContainer); var albumThumbnail = event.data.album.thumbnail; - var albumTitle = event.data.album.album_title||'Unknown'; - var albumArtist = event.data.album.album_artist||'Unknown'; + var albumTitle = event.data.album.album_title||'Unknown Album'; + var albumArtist = event.data.album.album_artist||'Unknown Artist'; var trackCount = data.result.total; $.each($(data.result.songs), jQuery.proxy(function(i, item) { - var trackRow = $(''); + var trackRow = $('').addClass('trackRow'); if (i == 0) { - var albumTD = $(''); - albumTD.attr('rowspan', ++trackCount).addClass('albumThumb'); + var albumTD = $('').attr('rowspan', ++trackCount).addClass('albumThumb'); trackRow.append(albumTD); } - var trackNumberTD = $(''); - trackNumberTD.html(item.tracknumber).addClass('track').bind('click', { song: item, album: event.data.album }, jQuery.proxy(this.playTrack, this)); + var trackNumberTD = $('') + .html(item.tracknumber) + .bind('click', { song: item, album: event.data.album }, jQuery.proxy(this.playTrack, this)); trackRow.append(trackNumberTD); - var trackTitleTD = $(''); - trackTitleTD.html(item.title).addClass('track').bind('click', { song: item, album: event.data.album }, jQuery.proxy(this.playTrack, this)); + var trackTitleTD = $('') + .html(item.title) + .bind('click', { song: item, album: event.data.album }, jQuery.proxy(this.playTrack, this)); trackRow.append(trackTitleTD); - var trackDurationTD = $(''); - trackDurationTD.html(durationToString(item.duration)).addClass('track').bind('click', { song: item, album: event.data.album }, jQuery.proxy(this.playTrack, this)); + var trackDurationTD = $('') + .addClass('time') + .html(durationToString(item.duration)) + .bind('click', { song: item, album: event.data.album }, jQuery.proxy(this.playTrack, this)); trackRow.append(trackDurationTD); - var trackArtistTD = $(''); - trackArtistTD.html(item.artist).addClass('track').bind('click', { song: item, album: event.data.album }, jQuery.proxy(this.playTrack, this)); + var trackArtistTD = $('') + .html(item.artist) + .bind('click', { song: item, album: event.data.album }, jQuery.proxy(this.playTrack, this)); trackRow.append(trackArtistTD); - var trackGenreTD = $(''); - trackGenreTD.html(item.genre).addClass('track').bind('click', { song: item, album: event.data.album }, jQuery.proxy(this.playTrack, this)); + var trackGenreTD = $('') + .html(item.genre) + .bind('click', { song: item, album: event.data.album }, jQuery.proxy(this.playTrack, this)); trackRow.append(trackGenreTD); $('#albumDetails' + event.data.album.albumid + ' .resultSet').append(trackRow); }, this)); if (trackCount > 0) { - var trackRow = $(''); - var trackNumberTD = $(''); - trackNumberTD.addClass('fillerTrack').html(' '); - trackRow.append(trackNumberTD); - var trackTitleTD = $(''); - trackTitleTD.addClass('fillerTrack').html(' '); - trackRow.append(trackTitleTD); - var trackDurationTD = $(''); - trackDurationTD.addClass('fillerTrack').html(' '); - trackRow.append(trackDurationTD); - var trackArtistTD = $(''); - trackArtistTD.addClass('fillerTrack').html(' '); - trackRow.append(trackArtistTD); - var trackGenreTD = $(''); - trackGenreTD.addClass('fillerTrack').html(' '); - trackRow.append(trackGenreTD); + var trackRow = $('').addClass('fillerTrackRow'); + for (var i = 0; i < 5; i++) { + trackRow.append($('').html(' ')); + } $('#albumDetails' + event.data.album.albumid + ' .resultSet').append(trackRow); + + var trackRow2 = $('').addClass('fillerTrackRow2'); + trackRow2.append($('').addClass('albumBG').html(' ')); + for (var i = 0; i < 5; i++) { + trackRow2.append($('').html(' ')); + } + $('#albumDetails' + event.data.album.albumid + ' .resultSet').append(trackRow2); } $('#albumDetails' + event.data.album.albumid + ' .albumThumb').append(this.generateThumb('album', albumThumbnail, albumTitle, albumArtist)); - $('.contentContainer').css('z-index', 1); + var footerPadding = $('

').addClass('footerPadding'); + $('#albumDetails' + event.data.album.albumid + ' .albumThumb').append(footerPadding); $('#spinner').hide(); + myScroll = new iScroll('albumDetails' + event.data.album.albumid); }, this), 'json'); } else { - $('.contentContainer').css('z-index', 1); - $('#albumDetails' + event.data.album.albumid).css('z-index', 100); + $('.contentContainer').hide(); + $('#albumDetails' + event.data.album.albumid).show(); } }, hideOverlay: function(event) { @@ -259,47 +313,49 @@ movieLibraryOpen: function() { this.resetPage(); $('#movieLibrary').addClass('selected'); - $('.contentContainer').css('z-index', 1); + $('.contentContainer').hide(); var libraryContainer = $('#movieLibraryContainer'); if (!libraryContainer || libraryContainer.length == 0) { $('#spinner').show(); jQuery.post(JSON_RPC + '?GetMovies', '{"jsonrpc": "2.0", "method": "VideoLibrary.GetMovies", "params": { "start": 0, "fields": ["genre", "director", "trailer", "tagline", "plot", "plotoutline", "title", "originaltitle", "lastplayed", "showtitle", "firstaired", "duration", "season", "episode", "runtime", "year", "playcount", "rating"] }, "id": 1}', jQuery.proxy(function(data) { if (data && data.result && data.result.movies) { libraryContainer = $('

'); - libraryContainer.css('z-index', 100) - .attr('id', 'movieLibraryContainer') + libraryContainer.attr('id', 'movieLibraryContainer') .addClass('contentContainer'); $('#content').append(libraryContainer); } else { libraryContainer.html(''); } + data.result.movies.sort(jQuery.proxy(this.movieTitleSorter, this)); $.each($(data.result.movies), jQuery.proxy(function(i, item) { var floatableMovieCover = this.generateThumb('movie', item.thumbnail, item.title, ""); floatableMovieCover.bind('click', { movie: item }, jQuery.proxy(this.displayMovieDetails, this)); libraryContainer.append(floatableMovieCover); }, this)); + var footerPadding = $('

').addClass('footerPadding'); + libraryContainer.append(footerPadding); $('#spinner').hide(); libraryContainer.bind('scroll', { activeLibrary: libraryContainer }, jQuery.proxy(this.updateScrollEffects, this)); libraryContainer.trigger('scroll'); //$('#libraryContainer img').lazyload(); + myScroll = new iScroll('movieLibraryContainer'); }, this), 'json'); } else { - libraryContainer.css('z-index', 100); + libraryContainer.show(); libraryContainer.trigger('scroll'); } }, tvshowLibraryOpen: function() { this.resetPage(); $('#tvshowLibrary').addClass('selected'); - $('.contentContainer').css('z-index', 1); + $('.contentContainer').hide(); var libraryContainer = $('#tvshowLibraryContainer'); if (!libraryContainer || libraryContainer.length == 0) { $('#spinner').show(); jQuery.post(JSON_RPC + '?GetTVShows', '{"jsonrpc": "2.0", "method": "VideoLibrary.GetTVShows", "params": { "start": 0, "fields": ["genre", "director", "trailer", "tagline", "plot", "plotoutline", "title", "originaltitle", "lastplayed", "showtitle", "firstaired", "duration", "season", "episode", "runtime", "year", "playcount", "rating"] }, "id": 1}', jQuery.proxy(function(data) { if (data && data.result && data.result.tvshows) { libraryContainer = $('

'); - libraryContainer.css('z-index', 100) - .attr('id', 'tvshowLibraryContainer') + libraryContainer.attr('id', 'tvshowLibraryContainer') .addClass('contentContainer'); $('#content').append(libraryContainer); } else { @@ -314,9 +370,10 @@ $('#spinner').hide(); libraryContainer.bind('scroll', { activeLibrary: libraryContainer }, jQuery.proxy(this.updateScrollEffects, this)); libraryContainer.trigger('scroll'); + myScroll = new iScroll('tvshowLibraryContainer'); }, this), 'json'); } else { - libraryContainer.css('z-index', 100); + libraryContainer.show(); libraryContainer.trigger('scroll'); } }, @@ -326,5 +383,27 @@ } else { $('#topScrollFade').fadeOut(); } + }, + albumArtistSorter: function(a, b) { + var result = this.sortAlpha(a.album_artist, b.album_artist); + if (result == 0) { + console.log('matches ', a.album_artist, b.album_artist); + return this.sortAlpha(a.album_title, b.album_title); + } + return result; + }, + sortAlpha: function(aStr, bStr) { + aStr = aStr.toLowerCase(); + bStr = bStr.toLowerCase(); + if (aStr < bStr) { + return -1; + } + if (aStr > bStr) { + return 1; + } + return 0; + }, + movieTitleSorter: function(a, b) { + return this.sortAlpha(a.title, b.title); } } \ No newline at end of file diff -Nru xbmc-10.00~svn33778/addons/webinterface.default/js/NowPlayingManager.js xbmc-10.00~svn34731/addons/webinterface.default/js/NowPlayingManager.js --- xbmc-10.00~svn33778/addons/webinterface.default/js/NowPlayingManager.js 2010-09-13 23:32:01.000000000 +0000 +++ xbmc-10.00~svn34731/addons/webinterface.default/js/NowPlayingManager.js 2010-10-06 23:15:48.000000000 +0000 @@ -35,24 +35,34 @@ $(window).bind('click', jQuery.proxy(this.hidePlaylist, this)); }, updateState: function() { - jQuery.post(JSON_RPC + '?UpdateState', '{"jsonrpc": "2.0", "method": "Player.GetActivePlayers", "id": 1}', jQuery.proxy(function(data) { - if (data && data.result) { - if (data.result.audio && this.activePlayer != 'Audio') { - this.activePlayer = 'Audio'; - this.stopVideoPlaylistUpdate(); - this.displayAudioNowPlaying(); - this.stopRefreshTime(); - } else if (data.result.video && this.activePlayer != 'Video') { - this.activePlayer = 'Video'; - this.stopAudioPlaylistUpdate(); - this.displayVideoNowPlaying(); - this.stopRefreshTime(); - } else if (!data.result.audio && !data.result.video) { - this.stopRefreshTime(); + jQuery.ajax({ + type: 'POST', + url: JSON_RPC + '?UpdateState', + data: '{"jsonrpc": "2.0", "method": "Player.GetActivePlayers", "id": 1}', + timeout: 2000, + success: jQuery.proxy(function(data) { + if (data && data.result) { + if (data.result.audio && this.activePlayer != 'Audio') { + this.activePlayer = 'Audio'; + this.stopVideoPlaylistUpdate(); + this.displayAudioNowPlaying(); + this.stopRefreshTime(); + } else if (data.result.video && this.activePlayer != 'Video') { + this.activePlayer = 'Video'; + this.stopAudioPlaylistUpdate(); + this.displayVideoNowPlaying(); + this.stopRefreshTime(); + } else if (!data.result.audio && !data.result.video) { + this.stopRefreshTime(); + } } - } - setTimeout(jQuery.proxy(this.updateState, this), 1000); - }, this), 'json'); + setTimeout(jQuery.proxy(this.updateState, this), 1000); + }, this), + error: jQuery.proxy(function(data, error) { + displayCommunicationError(); + setTimeout(jQuery.proxy(this.updateState, this), 2000); + }, this), + dataType: 'json'}); }, bindPlaybackControls: function() { $('#pbNext').bind('click', jQuery.proxy(this.nextTrack, this)); @@ -221,7 +231,7 @@ } }, this), error: jQuery.proxy(function(data) { - //TODO: Raise Communication Error + displayCommunicationError(); if (this.autoRefreshAudioPlaylist) { setTimeout(jQuery.proxy(this.updateAudioPlaylist, this), 2000); /* Slow down request period */ } @@ -259,7 +269,7 @@ } } } - if (this.autoRefreshData && !this.activeItemTimer) { + if ((this.autoRefreshAudioData || this.autoRefreshVideoData) && !this.activeItemTimer) { this.activeItemTimer = 1; setTimeout(jQuery.proxy(this.updateActiveItemDurationLoop, this), 1000); } @@ -460,7 +470,7 @@ } }, this), error: jQuery.proxy(function(data) { - //TODO: Raise Communication Error + displayCommunicationError(); if (this.autoRefreshVideoPlaylist) { setTimeout(jQuery.proxy(this.updateVideoPlaylist, this), 2000); /* Slow down request period */ } diff -Nru xbmc-10.00~svn33778/configure xbmc-10.00~svn34731/configure --- xbmc-10.00~svn33778/configure 2010-09-14 05:27:21.000000000 +0000 +++ xbmc-10.00~svn34731/configure 2010-10-13 15:50:50.000000000 +0000 @@ -15156,7 +15156,6 @@ xbmc/cores/paplayer/timidity/Makefile \ xbmc/cores/paplayer/AC3Codec/Makefile \ xbmc/cores/paplayer/ADPCMCodec/Makefile \ - xbmc/cores/paplayer/GYMCodec/Makefile \ xbmc/cores/paplayer/NSFCodec/Makefile \ xbmc/cores/paplayer/SIDCodec/Makefile \ xbmc/cores/paplayer/vgmstream/Makefile \ diff -Nru xbmc-10.00~svn33778/configure.in xbmc-10.00~svn34731/configure.in --- xbmc-10.00~svn33778/configure.in 2010-08-29 06:47:31.000000000 +0000 +++ xbmc-10.00~svn34731/configure.in 2010-10-04 17:48:26.000000000 +0000 @@ -1393,7 +1393,6 @@ xbmc/cores/paplayer/timidity/Makefile \ xbmc/cores/paplayer/AC3Codec/Makefile \ xbmc/cores/paplayer/ADPCMCodec/Makefile \ - xbmc/cores/paplayer/GYMCodec/Makefile \ xbmc/cores/paplayer/NSFCodec/Makefile \ xbmc/cores/paplayer/SIDCodec/Makefile \ xbmc/cores/paplayer/vgmstream/Makefile \ diff -Nru xbmc-10.00~svn33778/debian/changelog xbmc-10.00~svn34731/debian/changelog --- xbmc-10.00~svn33778/debian/changelog 2010-10-13 16:18:00.000000000 +0000 +++ xbmc-10.00~svn34731/debian/changelog 2010-10-13 16:18:18.000000000 +0000 @@ -1,8 +1,8 @@ -xbmc (2:10.00~svn33778-lucid1) lucid; urgency=low +xbmc (2:10.00~svn34731-lucid1) lucid; urgency=low - * Build of 10.00~svn33778 + * Build of 10.00~svn34731 - -- Billy (XBMC BuildBot) Mon, 13 Sep 2010 22:40:31 -0700 + -- Billy (XBMC BuildBot) Wed, 13 Oct 2010 09:02:57 -0700 xbmc (2:10.0~svn33745~deb1-1) experimental; urgency=low diff -Nru xbmc-10.00~svn33778/debian/control xbmc-10.00~svn34731/debian/control --- xbmc-10.00~svn33778/debian/control 2010-10-13 16:18:00.000000000 +0000 +++ xbmc-10.00~svn34731/debian/control 2010-10-13 16:18:18.000000000 +0000 @@ -54,7 +54,7 @@ with using XBMC Media Center. Package: xbmc-live -Architecture: all +Architecture: any Depends: xbmc-standalone (= ${binary:Version}), policykit, openssh-server, @@ -63,7 +63,8 @@ adduser, sudo, whois, - ${misc:Depends}, + ${misc:Depends}, + ${shlibs:Depends}, devicekit-disks, devicekit-power, Conflicts: kdm, gdm, xdm, wdm diff -Nru xbmc-10.00~svn33778/debian/control.in xbmc-10.00~svn34731/debian/control.in --- xbmc-10.00~svn33778/debian/control.in 2010-10-13 16:18:00.000000000 +0000 +++ xbmc-10.00~svn34731/debian/control.in 2010-10-13 16:18:18.000000000 +0000 @@ -38,7 +38,7 @@ with using XBMC Media Center. Package: xbmc-live -Architecture: all +Architecture: any Depends: #XBMC_LIVE_DEPENDS# Conflicts: kdm, gdm, xdm, wdm Description: XBMC Media Center (XBMC Live package) diff -Nru xbmc-10.00~svn33778/debian/rules xbmc-10.00~svn34731/debian/rules --- xbmc-10.00~svn33778/debian/rules 2010-10-13 16:18:00.000000000 +0000 +++ xbmc-10.00~svn34731/debian/rules 2010-10-13 16:18:18.000000000 +0000 @@ -97,9 +97,13 @@ dh_install --sourcedir=$(CURDIR)/debian/tmp -XLICENCE \ -XLicence.txt -XLicense.txt -XLiberationSans-Regular.ttf \ -XDejaVuSans.ttf -XDejaVuSans-Bold.ttf - # Delete stuff in xbmc-data that is in other packages + # Delete stuff that is in other packages rm -rf debian/xbmc-data/usr/share/xbmc/addons/skin.* rm -rf debian/xbmc-data/usr/share/xbmc/web + # Add in live.d scripts to packaging + mkdir -p debian/xbmc-live/etc/xbmc + cp -rf tools/XBMCLive/live.d debian/xbmc-live/etc/xbmc + override_dh_strip: dh_strip --dbg-package=xbmc-dbg diff -Nru xbmc-10.00~svn33778/debian/svnrevision xbmc-10.00~svn34731/debian/svnrevision --- xbmc-10.00~svn33778/debian/svnrevision 2010-10-13 16:18:00.000000000 +0000 +++ xbmc-10.00~svn34731/debian/svnrevision 2010-10-13 16:18:18.000000000 +0000 @@ -1 +1 @@ -33778 +34731 diff -Nru xbmc-10.00~svn33778/debian/var_info xbmc-10.00~svn34731/debian/var_info --- xbmc-10.00~svn33778/debian/var_info 2010-10-13 16:18:00.000000000 +0000 +++ xbmc-10.00~svn34731/debian/var_info 2010-10-13 16:18:18.000000000 +0000 @@ -42,7 +42,8 @@ adduser, sudo, whois, - \${misc:Depends}," + \${misc:Depends}, + \${shlibs:Depends}," if [ $(lsb_release -cs) = "karmic" ]; then XBMC_LIVE_DEPENDS="$XBMC_LIVE_DEPENDS devicekit-disks, diff -Nru xbmc-10.00~svn33778/debian/xbmc-live.install xbmc-10.00~svn34731/debian/xbmc-live.install --- xbmc-10.00~svn33778/debian/xbmc-live.install 2010-10-13 16:18:00.000000000 +0000 +++ xbmc-10.00~svn34731/debian/xbmc-live.install 2010-10-13 16:18:18.000000000 +0000 @@ -1,3 +1,4 @@ usr/bin/diskmounter usr/bin/runXBMC usr/bin/setAlsaVolumes + diff -Nru xbmc-10.00~svn33778/debian/xbmc-live.postinst xbmc-10.00~svn34731/debian/xbmc-live.postinst --- xbmc-10.00~svn33778/debian/xbmc-live.postinst 2010-10-13 16:18:00.000000000 +0000 +++ xbmc-10.00~svn34731/debian/xbmc-live.postinst 2010-10-13 16:18:18.000000000 +0000 @@ -192,6 +192,9 @@ fi done + if ! grep -i -q XBMCLive /etc/lsb-release ; then + sed -i -e "/^DISTRIB_DESCRIPTION/s/\"$.*$\"/\"\1 - XBMCLive Dharma\"/" /etc/lsb-release + fi # Add to grub's kernel entries if [ -f /boot/grub/menu.lst ]; then diff -Nru xbmc-10.00~svn33778/debian/xbmc-live.upstart xbmc-10.00~svn34731/debian/xbmc-live.upstart --- xbmc-10.00~svn33778/debian/xbmc-live.upstart 2010-10-13 16:18:00.000000000 +0000 +++ xbmc-10.00~svn34731/debian/xbmc-live.upstart 2010-10-13 16:18:18.000000000 +0000 @@ -32,6 +32,8 @@ echo "$@" | cut -d "=" -f 2 } + clear >/dev/tty7 || true + CMDLINE=$(cat /proc/cmdline) #Process command line options @@ -45,84 +47,34 @@ done echo $XBMC_PARAMS > /tmp/xbmcliveParams - # Relies on init scripts to mount boot device on a specified directory - # TODO hardcode the already mounted directories (speed) - # XBMC Live V2 - BOOTMEDIADIRECTORY="image" - BOOTMEDIAMOUNTPOINT="$(mount | grep $BOOTMEDIADIRECTORY | cut -f 3 -d ' ')" - if [ ! -n "$BOOTMEDIAMOUNTPOINT" ]; then - # XBMC Live V1 - BOOTMEDIADIRECTORY="bootMedia" - BOOTMEDIAMOUNTPOINT="$(mount | grep $BOOTMEDIADIRECTORY | cut -f 3 -d ' ')" - fi - - # Executes hooks (if any) in the "Hooks" directory - for hook in $(ls -1 $BOOTMEDIAMOUNTPOINT/Hooks/*.sh) - do - sh $hook - done - - - # Identify Ubuntu release - LSBRELEASE="$(lsb_release -r | cut -f2 | sed 's/\.//')" - - # Identify GPU, Intel by default - GPUTYPE="INTEL" - - GPU=$(lspci -nn | grep 0300) - # 10de == NVIDIA - if [ "$(echo $GPU | grep 10de)" ]; then - GPUTYPE="NVIDIA" - else - # 1002 == AMD - if [ "$(echo $GPU | grep 1002)" ]; then - GPUTYPE="AMD" - fi - fi - - # Generates valid xorg.conf for proprietary drivers if missing - if [ ! -e /etc/X11/xorg.conf ] && ! grep -q -i nogenxconf /tmp/xbmcliveParams ; then - if [ "$GPUTYPE" = "NVIDIA" ]; then - if [ $LSBRELEASE -gt 910 ]; then - # only on lucid! - update-alternatives --set gl_conf /usr/lib/nvidia-current/ld.so.conf - ldconfig - fi - - # run nvidia-xconfig - /usr/bin/nvidia-xconfig -s --no-logo --no-composite --no-dynamic-twinview --force-generate - - # Disable scaling to make sure the gpu does not loose performance - sed -i -e 's%Section \"Screen\"%&\n Option \"FlatPanelProperties\" \"Scaling = Native\"\n Option \"HWCursor\" \"Off\"%' /etc/X11/xorg.conf - fi - if [ "$GPUTYPE" = "AMD" ]; then - if [ $LSBRELEASE -gt 910 ]; then - # only on lucid! - update-alternatives --set gl_conf /usr/lib/fglrx/ld.so.conf - ldconfig - fi - - # run aticonfig - /usr/bin/aticonfig --initial --sync-vsync=on -f - fi - fi - - if [ ! "$(mount | grep iso9660)" ]; then - if ! grep -q -i noredir /tmp/xbmcliveParams ; then - if [ -n "$BOOTMEDIAMOUNTPOINT" ]; then - if [ ! -d $BOOTMEDIAMOUNTPOINT/dotXBMC ]; then - mkdir $BOOTMEDIAMOUNTPOINT/dotXBMC - fi - if [ -d /home/xbmc/.xbmc ]; then - if [ -L /home/xbmc/.xbmc ]; then - rm /home/xbmc/.xbmc - else - mv /home/xbmc/.xbmc /home/xbmc/.xbmc.previous - fi - fi - ln -s $BOOTMEDIAMOUNTPOINT/dotXBMC /home/xbmc/.xbmc - fi - fi + if grep "boot=live" /proc/cmdline ; then + # Relies on init scripts to mount boot device on a specified directory + BOOTMEDIAMOUNTPOINT="/live/image" + fi + + BOOTHOOKSDIRECTORY="/etc/xbmc" + + xbmcUser=xbmc + # Read configuration variable file if it is present + [ -r /etc/default/xbmc-live ] && . /etc/default/xbmc-live + if ! getent passwd $xbmcUser >/dev/null; then + xbmcUser=$(getent passwd 1000 | sed -e 's/\:.*//') + fi + + # Executes pre-hooks (if any) in the System "Hooks" directory + if [ -d $BOOTHOOKSDIRECTORY/live.d ]; then + for hook in $(find $BOOTHOOKSDIRECTORY/live.d -type f -perm /u=x,g=x,o=x | sort) + do + $hook $BOOTMEDIAMOUNTPOINT $XBMC_PARAMS + done + fi + + # Executes pre-hooks (if any) in the user "Hooks" directory + if [ -d /home/$xbmcUser/.xbmc/live.d ]; then + for hook in $(find /home/$xbmcUser/.xbmc/live.d -type f -perm /u=x,g=x,o=x | sort) + do + $hook $BOOTMEDIAMOUNTPOINT $XBMC_PARAMS + done fi if [ -f /home/xbmc/.xsession ] ; then @@ -141,83 +93,6 @@ exec /usr/bin/runXBMC end script -post-start script - findUSBPort() { - local FD=7 - local tmpFile=$(mktemp) - local eof=0 - local line - local usbPort="" - local pciDevice="" - local inBlock="0" - local token=$1 - - lshal > $tmpFile - - # Open files. - eval exec "$FD<$tmpFile" - - while [ $eof -eq 0 ] - do - if read line <&$FD; then - if [ -n "$(echo $line | grep -i $token)" ]; then - if [ "$inBlock" = "0" ]; then - inBlock="1" - token="linux.sysfs_path" - else - pciDevice=$(echo $line | awk -F/ '{ print $5}') - eof=1 - fi - fi - else - eof=1 - fi - done - - if [ -n "$pciDevice" ] ; then - usbPort=$(cat /proc/acpi/wakeup | grep $pciDevice | awk '{ print $1}') - fi - - echo $usbPort - } - - - if grep -q -i setvolume /tmp/xbmcliveParams ; then - /usr/bin/setAlsaVolumes - fi - - if ! grep -q -i nodiskmount /tmp/xbmcliveParams ; then - /usr/bin/diskmounter - fi - - if grep -q -i wakeOnUSBRemote /tmp/xbmcliveParams ; then - lircDriver=$(dmesg | grep usbcore | grep -i 'lirc' | sed -e "s/.* $lirc*$/\1/" | head -n 1) - if [ ! -n "$lircDriver" ] ; then - # No lirc driver loaded - exit - fi - - # Wait for udevtrigger to settle down (if any) - udevTriggerPID=$(ps x | grep udevtrigger | grep -v grep | cut -f2 -d ' ') - if [ -n "udevTriggerPID" }; then - while test -d /proc/$udevTriggerPID; do sleep 1; done; - fi - - usbPort=$(findUSBPort "${lircDriver}") - - if [ -z "$usbPort" ]; then - # No USB Remote found - exit - fi - - usbStatus=`cat /proc/acpi/wakeup | grep $usbPort | awk {'print $3}'` - if [ "$usbStatus" = "disabled" ]; then - echo $usbPort > /proc/acpi/wakeup - echo -1 >/sys/module/usbcore/parameters/autosuspend - fi - fi -end script - pre-stop script touch /tmp/noRestartXBMC rm /tmp/xbmcliveParams diff -Nru xbmc-10.00~svn33778/guilib/common/LIRC.cpp xbmc-10.00~svn34731/guilib/common/LIRC.cpp --- xbmc-10.00~svn33778/guilib/common/LIRC.cpp 2010-09-03 07:02:18.000000000 +0000 +++ xbmc-10.00~svn34731/guilib/common/LIRC.cpp 2010-10-07 21:29:24.000000000 +0000 @@ -278,8 +278,11 @@ m_button = CButtonTranslator::GetInstance().TranslateLircRemoteString(deviceName, buttonName); - int repeat = atol(repeatStr); - if (strcmp(repeatStr, "00") == 0) + char *end = NULL; + long repeat = strtol(repeatStr, &end, 16); + if (!end || *end != 0) + CLog::Log(LOGERROR, "LIRC: invalid non-numeric character in expression %s", repeatStr); + if (repeat == 0) { CLog::Log(LOGDEBUG, "LIRC: %s - NEW at %d:%s (%s)", __FUNCTION__, now, m_buf, buttonName); m_firstClickTime = now; diff -Nru xbmc-10.00~svn33778/guilib/GUIFontTTFDX.cpp xbmc-10.00~svn34731/guilib/GUIFontTTFDX.cpp --- xbmc-10.00~svn33778/guilib/GUIFontTTFDX.cpp 2010-07-17 04:09:13.000000000 +0000 +++ xbmc-10.00~svn34731/guilib/GUIFontTTFDX.cpp 2010-10-06 02:07:12.000000000 +0000 @@ -19,12 +19,15 @@ * */ +#ifdef HAS_DX + #include "GUIFont.h" #include "GUIFontTTFDX.h" #include "GUIFontManager.h" #include "Texture.h" #include "gui3d.h" #include "WindowingFactory.h" +#include "utils/log.h" // stuff for freetype #include "ft2build.h" @@ -35,8 +38,6 @@ using namespace std; -#ifdef HAS_DX - struct CUSTOMVERTEX { FLOAT x, y, z; @@ -48,12 +49,12 @@ CGUIFontTTFDX::CGUIFontTTFDX(const CStdString& strFileName) : CGUIFontTTFBase(strFileName) { - + m_speedupTexture = NULL; } CGUIFontTTFDX::~CGUIFontTTFDX(void) { - + SAFE_DELETE(m_speedupTexture); } void CGUIFontTTFDX::RenderInternal(SVertex* v) @@ -122,44 +123,113 @@ CBaseTexture* CGUIFontTTFDX::ReallocTexture(unsigned int& newHeight) { - CBaseTexture* pNewTexture = new CTexture(m_textureWidth, newHeight, XB_FMT_A8); - - if (pNewTexture == NULL) - return NULL; - + CBaseTexture* pNewTexture = new CDXTexture(m_textureWidth, newHeight, XB_FMT_A8); pNewTexture->CreateTextureObject(); - LPDIRECT3DTEXTURE9 newTexture = pNewTexture->GetTextureObject(); if (newTexture == NULL) + { + CLog::Log(LOGERROR, __FUNCTION__" - failed to create the new texture h=%d w=%d", m_textureWidth, newHeight); + SAFE_DELETE(pNewTexture); return NULL; + } - // correct texture sizes - D3DSURFACE_DESC desc; - newTexture->GetLevelDesc(0, &desc); - m_textureHeight = desc.Height; - m_textureWidth = desc.Width; - - DWORD flags = (desc.Usage & D3DUSAGE_DYNAMIC) ? D3DLOCK_DISCARD : 0; - D3DLOCKED_RECT rect; - newTexture->LockRect(0, &rect, NULL, flags); - memset(rect.pBits, 0, rect.Pitch * m_textureHeight); - newTexture->UnlockRect(0); - - if (m_texture) - { // copy across from our current one using gpu - LPDIRECT3DSURFACE9 pTarget, pSource; - newTexture->GetSurfaceLevel(0, &pTarget); - m_texture->GetTextureObject()->GetSurfaceLevel(0, &pSource); + // Use a speedup texture in system memory when main texture in default pool+dynamic + // Otherwise the texture would have to be copied from vid mem to sys mem, which is too slow for subs while playing video. + CD3DTexture* newSpeedupTexture = NULL; + if (g_Windowing.DefaultD3DPool() == D3DPOOL_DEFAULT && g_Windowing.DefaultD3DUsage() == D3DUSAGE_DYNAMIC) + { + newSpeedupTexture = new CD3DTexture(); - // TODO:DIRECTX - this is probably really slow, but UpdateSurface() doesn't like rendering from non-system textures - D3DXLoadSurfaceFromSurface(pTarget, NULL, NULL, pSource, NULL, NULL, D3DX_FILTER_NONE, 0); + if (!newSpeedupTexture->Create(m_textureWidth, newHeight, 1, 0, D3DFMT_A8, D3DPOOL_SYSTEMMEM)) + { + SAFE_DELETE(newSpeedupTexture); + SAFE_DELETE(pNewTexture); + return NULL; + } + } - SAFE_RELEASE(pTarget); + LPDIRECT3DSURFACE9 pSource, pTarget; + HRESULT hr; + // There might be data to copy from the previous texture + if ((newSpeedupTexture && m_speedupTexture) || (newTexture && m_texture)) + { + if (m_speedupTexture) + { + m_speedupTexture->GetSurfaceLevel(0, &pSource); + newSpeedupTexture->GetSurfaceLevel(0, &pTarget); + } + else + { + m_texture->GetTextureObject()->GetSurfaceLevel(0, &pSource); + newTexture->GetSurfaceLevel(0, &pTarget); + } + + D3DLOCKED_RECT srclr, dstlr; + if(FAILED(pSource->LockRect( &srclr, NULL, 0 )) + || FAILED(pTarget->LockRect( &dstlr, NULL, 0 ))) + { + CLog::Log(LOGERROR, __FUNCTION__" - failed to lock surfaces"); + SAFE_DELETE(newSpeedupTexture); + SAFE_DELETE(pNewTexture); + pSource->Release(); + pTarget->Release(); + return NULL; + } + + unsigned char *dst = (unsigned char *)dstlr.pBits; + unsigned char *src = (unsigned char *)srclr.pBits; + unsigned int dstPitch = dstlr.Pitch; + unsigned int srcPitch = srclr.Pitch; + unsigned int minPitch = std::min(srcPitch, dstPitch); + + if (srcPitch == dstPitch) + { + memcpy(dst, src, srcPitch * m_textureHeight); + } + else + { + for (unsigned int y = 0; y < m_textureHeight; y++) + { + memcpy(dst, src, minPitch); + src += srcPitch; + dst += dstPitch; + } + } + pSource->UnlockRect(); + pTarget->UnlockRect(); + + pSource->Release(); + pTarget->Release(); + } + + // Upload from speedup texture to main texture + if (newSpeedupTexture && m_speedupTexture) + { + LPDIRECT3DSURFACE9 pSource, pTarget; + newSpeedupTexture->GetSurfaceLevel(0, &pSource); + newTexture->GetSurfaceLevel(0, &pTarget); + const RECT rect = { 0, 0, m_textureWidth, m_textureHeight }; + const POINT point = { 0, 0 }; + + hr = g_Windowing.Get3DDevice()->UpdateSurface(pSource, &rect, pTarget, &point); SAFE_RELEASE(pSource); - SAFE_DELETE(m_texture); + SAFE_RELEASE(pTarget); + + if (FAILED(hr)) + { + CLog::Log(LOGERROR, __FUNCTION__": Failed to upload from sysmem to vidmem (0x%08X)", hr); + SAFE_DELETE(newSpeedupTexture); + SAFE_DELETE(pNewTexture); + return NULL; + } } + SAFE_DELETE(m_texture); + SAFE_DELETE(m_speedupTexture); + m_textureHeight = newHeight; + m_speedupTexture = newSpeedupTexture; + return pNewTexture; } @@ -167,9 +237,11 @@ { FT_Bitmap bitmap = bitGlyph->bitmap; - // render this onto our normal texture using gpu LPDIRECT3DSURFACE9 target; - m_texture->GetTextureObject()->GetSurfaceLevel(0, &target); + if (m_speedupTexture) + m_speedupTexture->GetSurfaceLevel(0, &target); + else + m_texture->GetTextureObject()->GetSurfaceLevel(0, &target); RECT sourcerect = { 0, 0, bitmap.width, bitmap.rows }; RECT targetrect; @@ -177,13 +249,29 @@ targetrect.left = m_posX + bitGlyph->left; targetrect.bottom = targetrect.top + bitmap.rows; targetrect.right = targetrect.left + bitmap.width; - - D3DXLoadSurfaceFromMemory( target, NULL, &targetrect, - bitmap.buffer, D3DFMT_LIN_A8, bitmap.pitch, NULL, &sourcerect, - D3DX_FILTER_NONE, 0x00000000); + + HRESULT hr = D3DXLoadSurfaceFromMemory( target, NULL, &targetrect, + bitmap.buffer, D3DFMT_LIN_A8, bitmap.pitch, NULL, &sourcerect, + D3DX_FILTER_NONE, 0x00000000); SAFE_RELEASE(target); + if (FAILED(hr)) + { + CLog::Log(LOGERROR, __FUNCTION__": Failed to copy the new character (0x%08X)", hr); + return false; + } + + if (m_speedupTexture) + { + // Upload to GPU - the automatic dirty region tracking takes care of the rect. + HRESULT hr = g_Windowing.Get3DDevice()->UpdateTexture(m_speedupTexture->Get(), m_texture->GetTextureObject()); + if (FAILED(hr)) + { + CLog::Log(LOGERROR, __FUNCTION__": Failed to upload from sysmem to vidmem (0x%08X)", hr); + return false; + } + } return TRUE; } diff -Nru xbmc-10.00~svn33778/guilib/GUIFontTTFDX.h xbmc-10.00~svn34731/guilib/GUIFontTTFDX.h --- xbmc-10.00~svn33778/guilib/GUIFontTTFDX.h 2009-09-22 04:22:59.000000000 +0000 +++ xbmc-10.00~svn34731/guilib/GUIFontTTFDX.h 2010-10-06 02:06:55.000000000 +0000 @@ -30,7 +30,7 @@ #include "GUIFontTTF.h" - +#include "D3DResource.h" /*! \ingroup textures @@ -50,6 +50,8 @@ virtual bool CopyCharToTexture(FT_BitmapGlyph bitGlyph, Character *ch); virtual void DeleteHardwareTexture(); virtual void RenderInternal(SVertex* v); + CD3DTexture *m_speedupTexture; // extra texture to speed up reallocations when the main texture is in d3dpool_default. + // that's the typical situation of Windows Vista and above. }; #endif diff -Nru xbmc-10.00~svn33778/guilib/Key.h xbmc-10.00~svn34731/guilib/Key.h --- xbmc-10.00~svn33778/guilib/Key.h 2010-09-03 07:02:18.000000000 +0000 +++ xbmc-10.00~svn34731/guilib/Key.h 2010-09-14 15:08:59.000000000 +0000 @@ -286,6 +286,8 @@ #define ACTION_GESTURE_PAN 225 #define ACTION_GESTURE_END 226 +#define ACTION_PLAYER_PLAYPAUSE 227 // Play/pause. If playing it pauses, if paused it plays. + // Window ID defines to make the code a bit more readable #define WINDOW_INVALID 9999 #define WINDOW_HOME 10000 diff -Nru xbmc-10.00~svn33778/language/Chinese (Simple)/strings.xml xbmc-10.00~svn34731/language/Chinese (Simple)/strings.xml --- xbmc-10.00~svn33778/language/Chinese (Simple)/strings.xml 2010-09-03 14:58:03.000000000 +0000 +++ xbmc-10.00~svn34731/language/Chinese (Simple)/strings.xml 2010-09-23 07:49:45.000000000 +0000 @@ -1,6 +1,6 @@ - - + + 程序图片 @@ -88,7 +88,8 @@ 创建缩略图快捷方式暂停 - + 更新失败 + 安装失败复制移动删除 @@ -173,6 +174,7 @@ 选择视频：读取%s信息载入视频详细资料 + Web 界面标语大纲 @@ -1273,6 +1275,11 @@ 极高（慢）同步回放显示 + 切换刷新率时暂停播放 + 关 + %.1f 秒 + %.1f 秒 + Apple 遥控器允许用遥控器启动 XBMC @@ -2098,11 +2105,11 @@ 选择艺人艺人信息乐器 - 创建时间 - 成型时间 + 出生日期 + 出道时间风格解散时间 - 死亡时间 + 去世时间活跃年代标签创建/成型 @@ -2269,7 +2276,7 @@ 保存拷贝设置下载目录 - 搜索持续时间 + 搜索持续时间短长用DVD player代替常规播放器 diff -Nru xbmc-10.00~svn33778/language/Czech/strings.xml xbmc-10.00~svn34731/language/Czech/strings.xml --- xbmc-10.00~svn33778/language/Czech/strings.xml 2010-02-28 16:02:03.000000000 +0000 +++ xbmc-10.00~svn34731/language/Czech/strings.xml 2010-09-28 13:27:57.000000000 +0000 @@ -1,8 +1,8 @@ - - + + Programy Obrázky @@ -56,6 +56,24 @@ Lis Pro + S + SSV + SV + VSV + V + VJV + JV + JJV + J + JJZ + JZ + ZJZ + Z + ZSZ + SZ + SSZ + proměnlivé + Automaticky Auto (velké) Ikony @@ -71,7 +89,8 @@ Vytvořit náhledy Zástupci POZASTAVENO - + Aktualizace se nezdařila + Instalace se nezdařila Kopírovat Přesunout Odstranit @@ -121,15 +140,17 @@ Nedostupné Vysunout disk Načítám - Žádný disk - Indikace disku + Žádné médium + Médium vloženo Vzhled - FTP Server: + Rozlišení obrazovky - Přizpůsobovat obnovovací frekvenci obrazovky - Přehrávat videa s poměrem stran 4:3 v režimu 16:9 + Přizpůsobovat obnovovací frekvenci obrazovky dle videa + + Datum vydání: + Režim zobrazení 4:3 videí Nálady Styly: @@ -154,6 +175,7 @@ Vyberte film: Probíhá získávání informací pro %s Probíhá načítání informací k filmu + Webové rozhraní Ve zkratce Děj filmu @@ -177,7 +199,7 @@ Čas zobrazení obrázku Testovací obrazce - Stahovat informace z FreeDB.org + Stahovat informace o CD z FreeDB.org Po načtení seznamu stop přehrávat skladby náhodně Uspávat HDD Video filtry @@ -190,6 +212,12 @@ Zmenšení: Zvětšení: Vymazat seznam stop po dokončení přehrávání + Režim zobrazení + Celá obrazovka #%d + V okně + Obnovovací frekvence + Celá obrazovka + Změna velikosti: (%i,%i)->(%i,%i) (Přiblížení x%2.2f) AR:%2.2f:1 (Pixelů: %2.2f:1) Skripty Jazyk @@ -200,7 +228,7 @@ Počet kanálů - DTS kompatibilní receiver CDDB - Probíhá stahování CDDB informací z FreeDB... + Probíhá stahování informací o CD Chyba Zobrazovat ID3 popisky Otevírám... @@ -215,7 +243,7 @@ Dle názvu Dle interpreta Dle alba - 100 NEJ + Top 100 Nastavení levého horního okraje Nastavení pravého dolního okraje Umístění titulků @@ -249,15 +277,15 @@ Jazyk Aktivováno Neprokládané video - - Automatický postprocessing - - Odstranění vertikál. bloků - - Odstranění horizont. bloků - - Přizpůsobení jasu/kontrastu - - Dering + + + + + (0=auto) - Probíhá reorganizace knihovny + Probíhá aktualizace knihovny Probíhá příprava... - Chyba v knihovně + Chyba knihovny Probíhá vyhledávání skladeb... Reorganizace proběhla úspěšně Probíhá označení skladeb k odstranění @@ -281,7 +309,7 @@ Přizpůsobit snímkování TV normě Zvukový výstup Analogový - Digitální + Optický/Koaxiální Různí interpreti Přehrát DVD Filmy @@ -291,8 +319,8 @@ Zvyšovat hlasitost při downmixu Programy Vypnuto - Dim - Prázdné + Ztmavení + Černá obrazovka Kód Matrixu Počkat Špořič obrazovky @@ -303,12 +331,12 @@ Celková prezentace Úroveň ztmavení Dle souborů - - AC3 kompatibilní reciever + - Dolby Digital (AC3) kompatibilní reciever Dle názvu Dle roku Dle hodnocení IMDb - Titul + Název bouřky částečně převážně @@ -346,18 +374,20 @@ Vítr Rosný bod Vlhkost - Z - rychlostí + + Výchozí hodnoty - Probíhá připojování k weather.com Probíhá stahování počasí pro: Informace o počasí se nepodařilo získat Ručně - Pro toto album nebyla nalezena žádná recenze + Recenze tohoto alba není k dispozici Probíhá stahování náhledu... Není k dispozici Velké ikony + Nízké + Vysoké + HDMI Smazat informace o albu Smazat CDDB informace @@ -371,6 +401,7 @@ Nepoužívat mezipaměť Odebrat film z knihovny Opravdu chcete z knihovny odebrat '%s'? + Z %s rychlostí %i %s Vyměnitelný disk: Probíhá otevírání souboru @@ -385,13 +416,13 @@ Automaticky přehrávat média LCD Aktivní - Sloupce + Počet sloupců Adresa 1. řádku: Adresa 2. řádku: Adresa 3. řádku: Adresa 4. řádku: - Počet řádků: - mód + Počet řádků + Mód Zobrazení Titulky Zvuková stopa @@ -414,7 +445,7 @@ Vzhled & Jazyk Prostředí Zvuk - O xbmc + O XBMC Odebrat album Opakovat @@ -447,7 +478,7 @@ Poslední poslech Spustit Spustit v ... - Upravit název XBE + Kompilace Odebrat zdroj Přejít do jiné sekce @@ -466,19 +497,19 @@ Ikony Seznam II Ikony II - Sloupce II - Sloupce - Alba - DVD - DVD II - Info + Sloupce + Sloupce II + Náhledy alb + Náhledy DVD + DVD + Media info Zařízení pro výstup zvuku Zařízení pro passthrough zvuku - Tento Interpret nemá žádný životopis + Životopis tohoto interpreta není k dispozici Převádět vícekanalový zvuk na stereo Řadit dle: %s - Názvu + Název Datum Velikost Stopa @@ -494,13 +525,15 @@ Druh Využití Tvůrce alba - Počtu přehrání - Poslední poslech + Počet přehrání + Poslední přehrání Komentář - Přidání + Datum přidání Výchozí Studio Cesta + Země + Právě probíhá Způsob řazení Řadit dle @@ -529,8 +562,8 @@ Probíhá kopírování... Do: - Stopu nebo CD nelze zkopírovat - V sources.xml není nastavena složka pro ukládání kopií CD. + Stopu nebo CD se nepodařilo zkopírovat + Není nastavena složka pro ukládání kopií CD. Zkopírovat audiostopu Zadejte číslo @@ -538,10 +571,10 @@ Enkodér Kvalita Datový tok - Ukládat číslo stopy + Zahrnout číslo stopy Všechny skladby od Režim zobrazení - Základní + Normální Přiblížení 4:3 14:9 @@ -556,26 +589,28 @@ Úroveň - Nenormalizované skladby Vyvarovat se předimenzování hlasitosti u normalizovaných skladeb Odstraňovat černé kraje - Chcete načíst velký archív? + Je zapotřebí rozbalit velký archiv. Chcete pokračovat? Odebrat z knihovny Exportovat Knihovnu videí Importovat Knihovnu videí Probíhá import Probíhá export Knihovna videí - Rok + Roky Aktualizovat knihovnu - Zobrazit informace o ladění + Zobrazovat informace o ladění Vyberte spouštěcí soubor Vyberte Seznam stop Vyberte složku Informace o skladbě + Nelineární roztažení Zesílení hlasitosti Vyberte složku pro export Tento soubor není dostupný. Chcete ho odebrat z knihovny? Vyberte Skript + Úroveň komprese Probíhá aktualizace knihovny Probíhá odebírání skladby z knihovny @@ -592,7 +627,7 @@ Přidělování IP adresy Automatické (DHCP) Manuálně (Statická IP) - Výchozí (Dashboard) + - IP adresa - Maska podsítě - Výchozí brána @@ -604,6 +639,7 @@ Webový server FTP Server + - Port Uložit & použít @@ -644,7 +680,7 @@ Chyba %i: sdílená položka je nedostupná - Zkracovat dlouhé názvy při nahrávání přes FTP server + Zvukový výstup Probíhá vyhledávání Složka s obrázky pro Spořič obrazovky @@ -653,7 +689,7 @@ - Heslo Bezdrátové sítě - Bezpečnost Bezdrátové sítě Uložit a použít nastavení Bezdrátové sítě - Bez šifrování + Žádné šifrování WEP WPA WPA2 @@ -664,7 +700,6 @@ Síťové rozhraní bylo úspěšně deaktivováno. Název Bezdrátové sítě (ESSID) - Povolit programům v tomto počítači ovládat XBMC Port dálkového ovládání Rozsah portů pro dálkové ovládání @@ -675,11 +710,9 @@ Internet Bylo zadáno nesprávné číslo portu - Rozsah portu je 1-65535 - Rozsah portu je 1024-65535 + Povolený rozsah portu je 1-65535 + Povolený rozsah portu je 1024-65535 - XLink Kai - Online hry Náhled spořiče obrazovky Nemohu se připojit. XBMC se nepodařilo připojit k síťovému prostředku. @@ -717,13 +750,13 @@ Submenu Povolit tlačítka Submenu Oblíbené položky - Pluginy - Video - Pluginy - Hudba - Pluginy - Obrázky + Doplňky - Video + Doplňky - Hudba + Doplňky - Obrázky Probíhá načítání složky Bylo nalezeno %i položek Bylo nalezeno %i z %i položek - Pluginy programů + Doplňky - Programy Přiřadit náhled pluginu Nastavení pluginu Přístupové body (AP) @@ -731,14 +764,15 @@ - Uživatelské jméno Nastavení skriptu Singly + Zadejte webovou adresu SMB klient Pracovní skupina Uživatelské jméno Heslo - SMB WINS-Server - Připojit SMB sdílené složky + WINS server + Připojovat SMB sdílené složky Odebrat Hudba @@ -765,9 +799,9 @@ Programy & Obrázky & Hudba Programy & Obrázky & Obrázky - FTP Uživatelské jméno - FTP Heslo - Heslo uživatele bylo úspěšně uloženo! + + + Autodetekce Autodetekovat systém @@ -785,7 +819,7 @@ ustupující a - mrzoucí + mrznoucí později ojediněle přeháňky/hřmění @@ -807,6 +841,10 @@ Grains bouřky bouřky s přeháňkami + Střední + Velmi vysoké + Větrno + Mlhavo @@ -816,6 +854,9 @@ Délka Chyba skriptu! : %s + Je vyžadována novější verze - Více informací v logu + + Aktivovat LCD/VFD displej @@ -840,12 +881,13 @@ Nastavení->Síť Nastavení->Vzhled Nastavení->Skripty + Webový prohlížeč Videa/Seznam stop Nastavení->Profily Dialog Ano/Ne - Dialog s průběhem + Dialog s průběhem stavu Probíhá vyhledávání titulků... Probíhá načítání titulků... @@ -857,8 +899,8 @@ Hudba/Soubory Hudba/Knihovna Editor Seznamu Stop - 100 NEJ skladeb - 100 NEJ alb + Top 100 skladeb + Top 100 alb Programy Nastavení Předpověď počasí @@ -868,7 +910,6 @@ Knihovna Seznam stop - Hudba - Seznam stop - Video Informace o albu Informace o filmu @@ -947,19 +988,19 @@ Uložením se přepíše předchozí nastavení. Zobrazovat každý obrázek po dobu Používat efekty přibližení a posunutí obrázku - NTSC v módu PAL - PAL v módu NTSC - NTSC v módu PAL60 + + + 12h formát hodin 24h formát hodin Den/Měsíc Měsíc/Den - + Doba provozu minut hodin dní - Celková doba používaní XBMC + Celková doba používaní Počasí @@ -972,8 +1013,8 @@ - Prodleva - Minimální délka souboru Vypnout - Dashboard - Cesta k vlastnímu Dashboardu + + Výchozí způsob vypínání Ukončit Uspat (Hibernace) @@ -983,13 +1024,16 @@ Minimalizovat Funkce tlačítka pro vypnutí + Vypnout systém Existuje nějaké aktivní připojení (např. přes SSH) ? - Načtený vyměnitelný pevný disk + Připojen vyměnitelný pevný disk Nebezpečně odebrat zařízení Zařízení bylo úspěšně odebráno Joystick byl připojen Joystick byl odpojen + Úroveň baterie je nízká + Filtr blikání Ponechat nastavení ovladače (vyžadován restart) Vertikální synchronizace obrazovky (V-Sync) @@ -998,7 +1042,7 @@ Vždy zapnuto Vyzkoušet rozlišení obrazovky Nastavit toto rozlišení obrazovky? - Chcete toto rozlišení obrazovky použít? + Chcete ponechat toto rozlišení obrazovky? Vysoce kvalitní přepočet obrazu (upscaling) Vypnuto @@ -1010,13 +1054,12 @@ Lanczos Sinc VDPAU - VDPAU - HQ vysoká kvalita upscalingu + VDPAU - HQ přepočet VDPAU - rozsah barevného prostoru: 16-235 - Studio Levels - Ztmavovat ostatní obrazovky - Zakázano - Ztmavovat obrazovku + Vypnuto + Zapnuto Nalezeny aktivní spojení! V případě, že budete pokračovat je pravděpodobné že nebudete @@ -1027,27 +1070,27 @@ k ovládání XBMC, změnou tohoto nastavení můžete přijít o možnost ovládání. Opravdu chcete pokračovat? - Klíč: - Teplota: - Model: - Firmware: - Model: - Sériové číslo: - Firmware: - Heslo: - Stav uzamčení: + + + + + + + + + Maska podsítě Výchozí brána Primární DNS Inicializace selhala - Gamepad - Klávesnice - Myš - Sluchátka/Mikrofon - Paměťová karta - Dálkový ovladač - Port ovladače + + + + + + + Nikdy @@ -1066,6 +1109,8 @@ Budík nastaven na %im Budíček! Budík byl přerušen %im%is před spuštěním + %2.0fm + %2.0fs Načítat titulky z RAR archivů Načíst titulky... @@ -1087,16 +1132,16 @@ Operační systém: CPU frekvence: - BIOS: + Grafický adaptér: Rozlišení obrazovky: - Verze XBOXu: - Sériové číslo XBOXu: - Výrobce XBOXu: - Modchip: + + + + A/V kabel: - Video & XBE Oblast: - DVD oblast: + + DVD region: Internet: Připojeno Nepřipojeno! Zkontrolujte nastavení sítě! @@ -1160,7 +1205,7 @@ Hardwarové překrytí Vysoká kvalita Pixel Shaderu Přehrát položku - Přiřadit náhled interpretovi + Přiřadit ikonu interpreta Automaticky generovat náhledy Povolit úpravu hlasu Povolit zařízení @@ -1193,7 +1238,7 @@ Zobrazovat pozici stopy Zrušit výchozí složku Pokračovat - Přiřadit náhled + Změnit náhled Informace o obrázku %s předvolby (Hodnocení uživatelů IMDb) @@ -1214,6 +1259,12 @@ Zapamatovat pro tuto cestu Použít objekty vyrovnávací paměti pixelu Broadcom Crystal HD + Aktivovat hardwarovou akceleraci (VAAPI) + Aktivovat hardwarovou akceleraci (DXVA2) + Aktivovat hardwarovou akceleraci (CrystalHD) + Aktivovat hardwarovou akceleraci (VDADecoder) + Aktivovat hardwarovou akceleraci (OpenMax) + Pixel Shadery Způsob synchronizace A/V dle audia @@ -1225,10 +1276,15 @@ Střední Vysoká Velmi vysoká - Synchronizovat přehrávání s frekvencí obrazovky + Synchronizovat přehrávání videa k frekvenci obrazovky + + Při změně obnovovací frekvence pozastavit přehrávání + Vypnuto + %.1f Sekunda + %.1f Sekundy Dálkové ovládání Apple - + Povolit spuštění XBMC dálkovým ovladačem Posloupnost zpoždění @@ -1320,7 +1376,7 @@ Soubory a složky Zobrazovat EXIF informace o obrázku Upřednostňovat režim celé obrazovky na velikost okna - Při výběru skladby ji přidat do fronty + Přidávat skladby do fronty při jejich výběru Automaticky přehrávat Audio CD Přehrávání DVD @@ -1351,7 +1407,7 @@ Zvuky při navigaci Standardní Téma vzhledu - Originální vzhled + Výchozí vzhled Last.FM Last.FM - Odesílat informace o skladbách @@ -1436,8 +1492,8 @@ Hlavní - CDDB vyhledávání - Přehrávaní + Vyhledávání na internetu + Přehrávač Přehrávat soubory z CD/DVD Zadejte nový název @@ -1453,10 +1509,10 @@ bez změny zpracovat automaticky deinterlacovat - sync lich. řád. - sync sud. řád. + Bob + Bob (opačný) Prokládaný materiál - Stornuji... + Probíha zrušení... Zadejte jméno interpreta Přehrávání selhalo Jednu nebo více položek se nepodařilo přehrát. @@ -1475,11 +1531,11 @@ Označit jako zhlédnuté Označit jako nezhlédnuté Upravit název - Používat NTSC-M & NTSC-J - Používat pouze NTSC-M - Používat pouze NTSC-J - Používat pouze PAL-60 - Pro 60Hz hry + + + + + Operace byla zrušena Kopírování selhalo @@ -1501,7 +1557,6 @@ Sinc (softwarově) Temporal Temporal/Spatial - (VDPAU) Redukce šumu (VDPAU) Ostrost Inverzní Telecine @@ -1509,6 +1564,12 @@ Automatický Temporal (poloviční) Temporal/Spatial (poloviční) + DXVA + + Post-processing + + + Zobrazovat odpočet do uspání @@ -1698,8 +1759,8 @@ Aktivovat automatické posouvání děje a recenze Vlastní Ukládat pokročilé informace o ladění - Stahovat doplňkové informace při aktualizaci knihovny - + Stahovat informace o albu při aktualizaci knihovny + Výchozí služba pro Inforamce o albu Výchozí stahovač pro hudbu Změnit Stahovač Exportovat Hudební knihovnu @@ -1714,6 +1775,9 @@ Nalévám sklenice (videas) WebDAV server (HTTP) WebDAV server (HTTPS) + První přihlášení, upravte si svůj profil + HTS Tvheadend klient + VDR Streamdev klient Web server složka (HTTP) Web server složka (HTTPS) @@ -1721,24 +1785,24 @@ Chcete ji přeskočit a pokračovat dále? RSS zpravodajství - Neznámá. Prosím přidejt MD5 ze souboru xbmc.log do BiosIDs.ini. + Sekundární DNS DHCP Server: Vytvořit novou složku - Rozsvítit LCD při přehrávání + Ztmavovat LCD při přehrávání Neznámé nebo integrované - Rozsvítit LCD při pozastavení - Zhasnout LED při pozastavení + Ztmavovat LCD při pozastavení + Video - Knihovna - Uložené pozice her + Dle ID - Stáhnout Uložené pozice her - Uložená pozice hry byla stažena na HDD - Stáhnutí Uložené pozice hry se nezdařilo - Vyberte Uloženou pozici hry ke stáhnutí a instalaci - Pro tuto hru nebyla nalezena žádná uložená pozice - Přejít na Uložené pozice her - Uložené pozice her + + + + + + + Hrát část... Vynulování kalibrace Tímto smažete veškeré uložené hodnoty kalibrace pro %s @@ -1766,13 +1830,13 @@ Režiséři V tomto umístění nebyl nalezen žádný video soubor! hlasů - Informace o seriálu + Informace o TV seriálu Informace o epizodě - Probíhá načítání detailů k seriálu + Probíhá načítání detailů k TV seriálu Probíhá zpracování informací k epizodám Probíhá načítání informací k epizodám ve složce Vyberte seriál: - Zadejte název seriálu + Zadejte název TV seriálu Řada %i Epizoda Epizod(y) @@ -1791,16 +1855,16 @@ Řada Probíhá stahování informací k videu Odebrat obsah - - Aktualizovat informace o seriálu + Původní název + Aktualizovat informace o TV seriálu Chcete aktualizovat informace pro všechny epizody? Složka obsahuje jediný seriál Nezahrnovat tuto složku při aktualizaci knihovny Specialní epizody Stahovat náhledy řad seriálů Složka obsahuje jediné video - Přiřadit k seriálu - Odebrat ze seriálu + Přiřadit k TV seriálu + Odebrat ze TV seriálu Nejnovější filmy Nejnovější epizody Studia @@ -1817,18 +1881,18 @@ Přejít k hudebním videoklipům alba Přejít k hudebním videoklipům interpreta Přehrát hudební videoklip - Stahovat náhledy herců při přidání filmu do knihovny - Přiřadit náhled herci + Stahovat ikony herců během přidání filmu dso knihovny + Změnit ikonu herce Odstranit záložku epizody Nastavit záložku epizody Nastavení Stahovače Stahují se informace k hudebnímu videu - Stahují se informace k seriálu + Stahují se informace k TV seriálu Upoutávka Jednoduchý mód - Použít jednoduchý mód u seriálu - Přiřadit FanArt + Zobrazit TV seriály zjednodušeně + Změnit FanArt Povolit Fanart v knihovně videí Probíhá vyhledávání nového obsahu Premiéra @@ -1836,7 +1900,7 @@ Zobrazovat "vyčištěné" názvy souborů Nikdy - V případě že má jedinou řadu + V případě že má 1 řadu Vždy Má upoutávku Nepravdivé @@ -1866,7 +1930,9 @@ Informace se nepodařilo stáhnout Server je pravděpodobně nedostupný. Chcete v aktualizaci pokračovat? - + Země + epizoda + epizod(y) Zobrazovat skryté soubory a složky @@ -1878,12 +1944,8 @@ Opravdu chcete spustit streamování? Probíhá připojení k: %s Zařízení TuxBox - - - - Přidat sdílení... Povolit sdílení knihoven filmů a hudby přes UPnP @@ -1895,7 +1957,7 @@ Povolit kurzor myši Přehrávat zvuky při přehrávání multimediálních souborů Náhledy - Vynucená oblast přehrávače DVD + Vynucení kódu regionu DVD přehrávače Video výstup Nastavení videa Normální @@ -1937,12 +1999,12 @@ není poslední Stahovače Výchozí stahovač pro filmy - Výchozí stahovač pro seriály + Výchozí stahovač pro TV seriály Výchozí stahovač pro hudební videoklipy Povolit odpověď na základě nastavení jazyka stahovače - Nastavení Vicejazyčný - + Nejsou k dispozici žádné stahovače Hodnota pro shodu Pravidlo vlastního Seznamu stop Skladby jsou shodné když @@ -1973,6 +2035,10 @@ Jazyk audia Jazyk titulků Dálkový ovladač emuluje stisky klávesnice + - Upravit + Je vyžadováno internetové připojení. + Získat další... + Kořenový adresař souborového systému Název souboru Cesta k souboru @@ -2033,7 +2099,7 @@ Povolit ovládání XBMC přes UPnP Při spuštění DVD se pokusit zobrazit rovnou hlavní menu Uložená hudba - Stáhnout Info pro všechny Interprety + Aktualizovat vše. Interprety Probíhá stahování informací k albu Probíhá stahování informací o Interpretovi Životopis @@ -2057,6 +2123,7 @@ Aktualizovat knihovnu vždy na pozadí - DNS sufix + %2.3fs zpoždění o %2.3fs předběhnutí o %2.3fs Posunutí titulků @@ -2080,7 +2147,6 @@ Direct3D verze: - Font - Velikost - Barva @@ -2096,9 +2162,13 @@ bílá/modrá černá/bílá - Plugin Počasí - - nastavení pluginu + Výchozí akce při výběru položky + Zobrazit nabídku + Zobrazit informace + Další nabídka... + Přehrát vše + Teletext není k dispozici Povolit Teletext Část %i Probíhá načítání %i bajtů @@ -2111,7 +2181,84 @@ Stiskněte OK po ukončení přehrávání - + + Doplněk + Doplňky + Možnosti doplňku + Informace o doplňku + + Zdroje médií + Informace o filmu + Spořič obrazovky + Skript + Vizualizace + Repozitář doplňků + Titulky + Texty skladeb + Informace o TV seriálu + Informace o hudebním videu + Informace o albu + Informace o intepretovi + + Nastavení + Deaktivovat + Aktivovat + Doplněk je deaktivován + Počasí + Weather.com (standardní) + Tento doplněk nelze konfigurovat + Chyba při načítaní konfigurace nastavení + Všechny doplňky + Získat nové doplňky + Zkontrolovat aktualizace + Vynutit obnovu + Změny + Odinstalovat + Nainstalovat + Deaktivované doplňky + (Zruší aktuální nastavení) + Instalovat doplněk ze zip archivu + Staženo %i%% + Doplňky s dostupnou aktualizací + + Dostupné doplňky + Verze: + Upozornění + Licence: + Změny + Chcete aktivovat tento doplňek? + Chcete deaktivovat tento doplňek? + Je k dispozici aktualizace doplňku! + Aktivované doplňky + Auto. aktualizace + Doplněk byl aktivován + Doplněk byl aktualizován + Opravdu chcete zrušit stahování doplňku? + Momentálně stahované doplňky + Aktualizace k dispozici + Aktualizovat + + Načtení doplňku se nezdařilo. + Objevila se neznámá chyba. + Vyžadována změna nastavení + Nelze se připojit + Je vyžadován restart + Deaktivovat + Pokusit se o opětovné připojení? + Doplněk se restartuje + Uzamknutí správce doplňků + + + + + + + + Doplněk byl v repozitáři označen jako nefunkční. + Chcete ho deaktivovat? + Nefunkční + + Mód knihovny QWERTY klávesnice Audio je přeposíláno receiveru @@ -2122,8 +2269,6 @@ - - Vyhledat délku Kvalita traileru Streamovat Stáhnout @@ -2134,6 +2279,7 @@ Probíhá ukládání Probíhá kopírování Nastavit složku pro stahování + Doba vyhledávání Krátký Dlouhý Místo běžného přehrávače používat DVD přehrávač @@ -2201,6 +2347,8 @@ Vorbis Wav DXVA + VAAPI + FLAC Konfigurace reproduktorů 2.0 @@ -2215,4 +2363,4 @@ 7.1 - \ No newline at end of file + diff -Nru xbmc-10.00~svn33778/language/Dutch/langinfo.xml xbmc-10.00~svn34731/language/Dutch/langinfo.xml --- xbmc-10.00~svn33778/language/Dutch/langinfo.xml 2010-06-19 23:50:17.000000000 +0000 +++ xbmc-10.00~svn34731/language/Dutch/langinfo.xml 2010-09-18 18:15:26.000000000 +0000 @@ -24,5 +24,6 @@ The De Het + Een diff -Nru xbmc-10.00~svn33778/language/Dutch/strings.xml xbmc-10.00~svn34731/language/Dutch/strings.xml --- xbmc-10.00~svn33778/language/Dutch/strings.xml 2010-09-07 17:58:48.000000000 +0000 +++ xbmc-10.00~svn34731/language/Dutch/strings.xml 2010-09-28 13:49:00.000000000 +0000 @@ -1,5 +1,5 @@ - + Programma's Afbeeldingen @@ -12,13 +12,13 @@ Weer XBMC Media Center - maandag - dinsdag - woensdag - donderdag - vrijdag - zaterdag - zondag + Maandag + Dinsdag + Woensdag + Donderdag + Vrijdag + Zaterdag + Zondag januari februari @@ -83,11 +83,12 @@ Nee Ja Diavoorstelling - Thumbnail maken - Thumbnails maken + Miniaturen aanmaken + Miniaturen aanmaken Snelkoppelingen Pauze - + Update mislukt + Installatie mislukt Kopieer Verplaats Verwijder @@ -113,7 +114,7 @@ Zoeken Systeeminformatie Temperaturen: - CPU: + Processor: GPU: Tijd: Huidige: @@ -131,7 +132,7 @@ Schijf Vrij Video - Vrij geheugen + Beschikbaar geheugen Geen verbinding Vrij Niet beschikbaar @@ -170,11 +171,12 @@ Zoeken... Geen informatie gevonden Kies film: - Zoek %s voor informatie %s - Filmgegevens downloaden + %s raadplegen voor informatie + Filmgegevens ophalen + Webinterface Slagzin - Plot: + Plot Stemmen: Acteurs @@ -211,7 +213,7 @@ Weergavemodus Volledig scherm #%d Venster - Verversingssnelheid + Verversingsfrequentie Volledig scherm Formaat: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixels: %2.2f:1) @@ -245,7 +247,7 @@ Positie ondertitels Aanpassing pixelratio Beweeg de pijlen om de overscan aan te passen - Beweeg de balk om de ondertiteling te verplaatsen + Beweeg de balk om de ondertitels te verplaatsen Pas de rechthoek aan zodat deze precies vierkant is Fout tijdens het laden van de instellingen Standaardinstellingen actief @@ -263,7 +265,7 @@ Ondertitels zoeken Positie opslaan Posities verwijderen - Synchroniseer geluid + Geluid synchroniseren Favorieten - Versterker ondersteunt AAC - Versterker ondersteunt MP1 @@ -284,50 +286,50 @@ Databasefout Zoeken op nummers... Klaar met opschonen - Markeer verwijderde nummers + Verwijderde nummers markeren Fout tijdens reorganiseren nummers - Opschonen artiesten... + Artiesten opschonen... Fout tijdens opschonen artiesten - Opschonen genres... + Genres opschonen... Fout tijdens opschonen genres - Opschonen locaties... + Locaties opschonen... Fout tijdens opschonen locaties - Opschonen albums... + Albums opschonen... Fout tijdens opschonen albums Aanpassingen opslaan... Fout tijdens opslaan aanpassingen Een moment geduld a.u.b. - Comprimeren bibliotheek... + Bibliotheek comprimeren... Fout tijdens comprimeren bibliotheek Wilt u de mediabibliotheek opschonen? Bibliotheek opschonen Start - Framerate-conversie + Framerateconversie Geluidsdoorgifte Analoog Digitaal - Diverse Artiesten + Diverse artiesten DVD afspelen Films Framerate aanpassen Acteurs Jaar - Verhoog volume bij downmix + Volume verhogen bij downmix Programma's Uit Dimmen Zwart Matrix Sporen - Schermbeveiliging wachttijd - Schermbeveiliging type + Wachttijd schermbeveiliging + Type schermbeveiliging XBMC afsluiten na Alle albums - Recent toegevoegde albums + Onlangs toegevoegde albums Schermbeveiliging Map Diavoorst. Doorzichtigheid schermbeveiliging Sorteer: Bestand - - AC3 compatibel versterker + - Versterker ondersteunt AC3 Sorteer: Naam Sorteer: Jaar Sorteer: Waardering @@ -359,11 +361,11 @@ max Nevel Mist - Selecteer locatie + Locatie selecteren Vernieuwingstijd Eenheid temperatuur Eenheid windsnelheid - Het Weer + Het weer Temperatuur Gevoelstemp. UV-index @@ -378,7 +380,7 @@ Fout tijdens ophalen gegevens Handmatig Geen recensie voor dit album - Thumbnail downloaden... + Miniatuur downloaden... Niet beschikbaar Layout: Groot Min @@ -390,19 +392,19 @@ Selecteer Geen albuminformatie gevonden. Geen CDDB-informatie gevonden. - Disk: + Schijf: Voer de juiste CD/DVD in Voer de volgende CD/DVD in Sorteer: DVD# Data niet bufferen - Verwijder video uit database + Video uit database verwijderen '%s' zeker verwijderen? Uit %s met %i %s - Verwijderbare schijf + Verwisselbare schijf Bestand openen Buffer - harde schijf + Harde schijf UDF LAN Internet @@ -419,11 +421,11 @@ Begin rij 4: Rijen Modus - Wijzig layout - Ondertiteling + Layout wijzigen + Ondertitels Geluidskanaal [actief] - Ondertiteling + Ondertitels Verlichting Helderheid Contrast @@ -443,16 +445,16 @@ Geluidsinstellingen Over XBMC - Verwijder album + Album verwijderen Herhalen - Herhaal één + Nummer herhalen Mappen herhalen Volgend nummer automatisch afspelen - - Gebruik grote iconen - Vergroot ondertiteling + - Grote iconen gebruiken + Ondertitels vergroten Geavanceerde opties (alleen experts!) Algemene audio headroom - Video naar GUI resolutie upsamplen + Video naar GUI-resolutie upsamplen Kalibratie Extensies mediabestanden tonen Sorteer: Type @@ -465,7 +467,7 @@ Media-info van bestanden inlezen... Sorteer: Gebruik Visualisaties weergeven - Automatisch videoweergave aanpassen aan regiocode + Videoweergave automatisch aanpassen aan regiocode Opstartscherm Beginscherm Handmatige instellingen @@ -477,10 +479,10 @@ Compilaties Snelkoppeling verwijderen - Verander van media - Kies playlist - Nieuwe playlist - Toevoegen aan playlist + Media veranderen + Afspeellijst kiezen + Nieuwe afspeellijst + Aan afspeellijst toevoegen Handmatig toevoegen Voer titel in Fout : Bestaande titel @@ -578,15 +580,15 @@ Originele grootte Eigen instelling Normalisering - Normalisatie methode + Normalisatiemethode Per nummer Per album Voorversterking - genormaliseerd Voorversterking - niet genormaliseerd - Voorkom het oversturen van genormaliseerde bestanden + Het oversturen van genormaliseerde bestanden voorkomen Zwarte balken afsnijden Er moet een groot bestand uitgepakt worden. Doorgaan? - Verwijder uit bibliotheek + Uit bibliotheek verwijderen Videobibliotheek exporteren Videobibliotheek importeren Importeren @@ -599,14 +601,14 @@ Afspeellijst openen Map openen Muziekinformatie - Non-linear uitrekken + Niet-lineair uitrekken Volumeversterking - Kies exporteerlocatie + Exporteerlocatie kiezen Dit bestand is niet langer beschikbaar. - Wilt u verwijderen uit de bibliotheek? - Zoeken naar een Script - Compressie level + Wilt u het verwijderen uit de bibliotheek? + Naar script zoeken + Compressieniveau Bibliotheek opschonen Oude nummers uit bibliotheek verwijderen @@ -679,43 +681,43 @@ Geluidshardware Uitpakken Map schermbeveiliging door diavoorstelling - Netwerk Verbinding - - Naam Draadloos Netwerk (ESSID) - Draadloos Netwerk Wachtwoord - Draadloos Netwerk Beveiligingsniveau + Netwerkverbinding + - Naam draadloos netwerk (ESSID) + Wachtwoord draadloos netwerk + Beveiligingsniveau draadloos netwerk Opslaan en Toepassen Netwerk Instellingen - Geen Encryptie + Geen versleuteling WEP WPA WPA2 - Netwerk instellingen toepassen. Een ogenblik geduld. - Herstarten netwerk verbinding succesvol. - Herstarten netwerk verbinding niet succesvol. + Netwerkinstellingen toepassen. Een ogenblik geduld. + Netwerkverbinding herstart. + Netwerkverbinding kon niet herstart worden. Verbinding uitgeschakeld Verbinding succesvol uitgeschakeld. - Naam Draadloos Netwerk (ESSID) + Naam draadloos netwerk (ESSID) - Activeer gebeurtenissen op afstand - Gebeurtenissen op afstand-poort - Gebeurtenissen op afstand-poortbereik - Ontvang gebeurtenissen van andere computers + Gebeurtenissen op afstand activeren + Poort voor gebeurtenissen op afstand + Poortbereik voor gebeurtenissen op afstand + Gebeurtenissen van andere computers ontvangen Initiële herhalingsvertraging (ms) Doorgaande herhalingsvertraging (ms) Maximaal aantal gebruikers - Internet toegang + Internettoegang - Ongeldige poortnummer ingevoerd - Geldig poort bereik is 1-65535 - Geldig poort bereik is 1024-65535 + Ongeldig poortnummer ingevoerd + Geldig poortbereik is 1-65535 + Geldig poortbereik is 1024-65535 - Voorbeeld - Verbinden niet mogelijk - XBMC kon niet verbinden met de netwerk locatie. + Verbinding mislukt + XBMC kon niet verbinden met de netwerklocatie. Dit kan veroorzaakt worden doordat het netwerk niet verbonden is. Wilt u het toch toevoegen? IP-adres - Voeg netwerklocatie toe + Netwerklocatie toevoegen Protocol Serveradres Servernaam @@ -737,7 +739,7 @@ Locatie toevoegen Locatie aanpassen Pas %s locatie aan - Voer nieuwe label in + Nieuw label opgeven Bladeren voor een afbeelding Bladeren voor een afbeeldingenmap Netwerklocatie toevoegen... @@ -756,15 +758,15 @@ Addon-instelingen Draadloze Netwerken Andere... - Webserver gebruikersnaam + Gebruikersnaam webserver Script instellingen Singles - Voer url in + Voer URL in SMB-client Werkgroep - Standaard gebruikersnaam - Standaard wachtwoord + Standaardgebruikersnaam + Standaardwachtwoord WINS-server Laad SMB gedeeld netwerk @@ -778,7 +780,7 @@ Muziek en afbeeldingen Muziek en bestanden Video en afbeeldingen - Video en bestanden + Video - Bestanden Afbeeldingen en bestanden Muziek, video's en afbeeldingen Muziek, video's, afbeeldingen en bestanden @@ -803,14 +805,14 @@ Nickname Vragen om verbinding te maken - FTP gebruikersnaam en wachtwoord verzenden - Ping interval in sec. + FTP-gebruikersnaam en -wachtwoord verzenden + Pinginterval in sec. Verbinding maken met de gevonden systeem? Zeroconf publishing Aangepaste geluidskaart - Aangepaste Passthrough apparaat + Aangepast Passthrough apparaat Driftsneeuw en @@ -843,19 +845,19 @@ - Energiebezuiniging inschakelen bij niet gebruik + Energiebezuiniging inschakelen bij inactiviteit - Speelduur: + Speelduur Fout in script! : %s - Nieuwere versie benodigd - Zie log + Nieuwere versie vereist - Zie log Gebruik LCD/VFD - Home + Beginscherm Programma's Afbeeldingen Bestandsbeheer @@ -983,12 +985,12 @@ Als standaard instellen voor alle video's Dit zal alle voorgaande opgeslagen waarden resetten Afbeeldingen weergeven gedurende - Gebruik pan en zoom effecten + Pan- en zoomeffecten gebruiken - 12 uurs formaat - 24 uurs formaat + 12-uursformaat + 24-uursformaat Dag/Maand Maand/Dag @@ -1014,22 +1016,23 @@ Standaard afsluitmodus Afsluiten Slaapstand - Annuleren + Sluimerstand Afsluiten Opnieuw opstarten - Minimaliseer - Actie voor power knop - - Er is een andere sessie actief, wellicht SSH ? - Mount verwisselbare harde schijf ? - Onveilig apparaat verwijderd - Succesvol verwijderd apparaat + Minimaliseren + Actie voor aan/uitknop + Systeem uitschakelen + + Er is een andere sessie actief, wellicht SSH? + Verwisselbare harde schijf aankoppelen? + Apparaat onveilig verwijderd + Apparaat succesvol verwijderd Joystick aangesloten Geen joystick aangesloten - Accuspanning laag + Lage accuspanning - flikkerfilter + Flikkerfilter Laat keuze aan driver (herstart vereist) Vertical blank sync Uitgeschakeld @@ -1041,27 +1044,27 @@ Softwarematige Hoge Kwaliteit Beeldverbetering Uitgeschakeld - Inschakelen voor SD beelden - Altijd Inschakelen + Inschakelen voor SD-beelden + Altijd inschakelen - Beeldverbeterings methode + Beeldverbeteringsmethode Bicubic Lanczos Sinc - Strikte Pixmap-Texture Binding (opnieuw opstarten vereist) + Strikte Pixmap-Texture Binding (vereist herstart) VDPAU HQ Upscaling level VDPAU Studio level color conversion Beeldscherm blanking Uitgeschakeld - Blank Beeldscherm + Blank beeldscherm - Actieve connecties gedetecteerd! - Als je doorgaat, kan je XBMC mogelijk niet meer - besturen. Weet je zeker dat je de Event Server wilt stoppen? + Actieve verbindingen gedetecteerd! + Als u doorgaat, kunt u XBMC mogelijk niet meer + besturen. Weet u zeker dat u de Event Server wilt stoppen? Verander Apple afstandsbediengsmodus? - Als je op dit moment de Apple afstandsbediening gebruikt + Als u op dit moment de Apple afstandsbediening gebruikt om XBMC te besturen, kan het veranderen van deze instelling de mogelijkheid om het te blijven besturen beïnvloeden. Doorgaan? @@ -1100,24 +1103,24 @@ Onbekend Overschrijven Alarmklok - Alarmklok interval (in minuten) + Alarmklokinterval (in minuten) Gestart, alarm over %im Alarm! Gestopt met nog %im%is te gaan %2.0fm %2.0fs - Zoeken naar ondertiteling in RARbestanden - Ondertiteling zoeken + Naar ondertitels zoeken in RAR-archieven + Ondertitels zoeken Item verplaatsen Item hierheen verplaatsen Verplaatsen annuleren Hardware: - CPU-gebruik: + Belasting: XBMC is verbonden, maar geen DNS beschikbaar. - harde schijf + Harde schijf DVD-ROM Opslag Standaard @@ -1126,38 +1129,38 @@ Hardware Kernelversie: - CPU-snelheid: + Kloksnelheid: - Video Encoder: + Video-encoder: Schermresolutie: - A/V Kabel: + A/V-kabel: - DVD regio: + DVD-regio: Internet: XBMC is verbonden - XBMC is niet verbonden. Controleer netwerkinstellingen. + XBMC is niet verbonden. Controleer uw netwerkinstellingen. - Doeltemperatuur - Ventilatorsnelheid Automatische ventilatorsnelheid - Ventilator snelheidsregeling - Lettertype voor skin - Bi-directionale tekst omdraaien + Snelheidsregeling ventilator + Skinlettertype + Bidirectionele tekst omdraaien RSS-feeds inschakelen Hoofdmap tonen Tracks weergeven als - Wilt u XBMC opnieuw opstarten + Wilt u het systeem herstarten in plaats van alleen XBMC? - Zoom effect - Zweef effect - Rand reductie - Reset/Reboot + Zoomeffect + Zweefeffect + Randreductie + Herinitialiseer/Herstart Nummers overvloeien - Thumbnails regenereren + Miniaturen regenereren Ook onderliggende mappen Diavoorstelling bekijken Diavoorstelling met mappen @@ -1188,20 +1191,20 @@ Afwisselen LED uit tijdens afspelen Filminformatie - Toevoegen aan afspeellijst + Aan afspeellijst toevoegen IMDb doorzoeken... - Scan voor nieuwe inhoud + Naar nieuwe inhoud scannen Afspeellijst weergeven Albuminformatie - Toevoegen aan bibliotheek - Scannen annuleren + Aan bibliotheek toevoegen + Scan annuleren Rendermethode Lage kwaliteit Pixel Shader Hardware Overlays Hoge kwaliteit Pixel Shader Item afspelen Afbeelding artiest instellen - Thumbnails automatisch aanmaken + Miniaturen automatisch aanmaken Stem inschakelen Apparaat inschakelen Volume @@ -1219,64 +1222,69 @@ Preset Er zijn geen presets beschikbaar voor deze visualisatie Er zijn geen instellingen beschikbaar voor deze visualisatie - Tray open/dicht - Toon visualisaties tijdens muziek afspelen + Lade open/dicht + Toon visualisaties tijdens afspelen muziek Bereken grootte - Bereken map grootte + Bereken mapgrootte Videoinstellingen - Geluid en ondertiteling instellingen - Ondertiteling gebruiken + Geluids- en ondertitelinstellingen + Ondertitels gebruiken Posities - Negeer lidwoorden tijdens sorteren (bv. The & De) + Lidwoorden negeren tijdens sorteren (bv. The & De) Albums laten overvloeien Zoeken naar %s Trackpositie weergeven Default leegmaken Hervatten - Thumbnails + Miniaturen Afbeeldingsinformatie %s presets IMDb-score Top 250 - Beluister het op Last.FM + Op Last.FM beluisteren Minimale ventilatorsnelheid Download - Artiest die alleen op verzamel cd's voorkomt weergeven + Artiest weergeven die alleen op verzamel-CD's voorkomt Rendermethode Automatisch detecteren - Eenvoudige Shaders (ARB) - Geavanceerde Shaders (GLSL) + Eenvoudige shaders (ARB) + Geavanceerde shaders (GLSL) Software Hardware veilig verwijderen VDPAU - Start diavoorstelling + Diavoorstelling starten Onthouden voor dit pad - Gebruik pixel buffer objecten - Hardware video acceleratie inschakelen (VDPAU) - Hardware video acceleratie inschakelen (VAAPI) - Hardware video acceleratie inschakelen (DXVA2) - Hardware video acceleratie inschakelen (CrystalHD) - Hardware video acceleratie inschakelen (VDADecoder) - Hardware video acceleratie inschakelen (OpenMax) - Pixel Shaders - - A/V sync methode - Audio klok - Video klok (Drop/Dupe audio) - Video klok (Resample audio) + Gebruik pixelbufferobjecten + Hardwareversnelling inschakelen (VDPAU) + Hardwareversnelling inschakelen (VAAPI) + Hardwareversnelling inschakelen (DXVA2) + Hardwareversnelling inschakelen (CrystalHD) + Hardwareversnelling inschakelen (VDADecoder) + Hardwareversnelling inschakelen (OpenMax) + Pixelshaders + + A/V-synchronisatiemethode + Audioklok + Videoklok (Drop/Dupe audio) + Videoklok (Resample audio) Maximum resample amount (%) - Resample kwaliteit + Resamplingkwaliteit Laag Medium Hoog Echt hoog - Synchroniseer afspelen video naar beeldscherm + Afspelen video naar beeldscherm synchroniseren + + Tijdens wijzigen verversingsfrequentie pauzeren + Uit + %.1f Seconde + %.1f Seconden Apple afstandsbediening - Altijd draaiend - Start ondertiteling eerder/later + Altijd actief + Ondertitel eerder/later starten Uitgeschakeld Standaard @@ -1295,14 +1303,14 @@ Afspeellijst downloaden mislukt Spellocatie - Automatisch omschakelen naar thumbnails als - Automatisch omschakelen naar thumbnails + Automatisch overschakelen naar miniaturen als + Automatisch overschakelen naar miniaturen - Gebruik grote iconen - Baseren op - Percentage Geen bestanden en minimaal 1 thumb - Tenminste 1 thumbnail - Het percentage thumbnails + Tenminste 1 miniatuur + Het percentage miniaturen Weergaveopties Locatie 1 Locatie 2 @@ -1310,14 +1318,14 @@ Bibliotheek Geen TV De dichtstbijzijnde grote plaats - Video/Geluid/DVD buffer - harde schijf - Video buffer - DVD + Video-/geluids-/DVD-buffer - harde schijf + Videobuffer - DVD - Lokaal netwerk - Internet Geluidsbuffer - DVD - Lokaal netwerk - Internet - DVD buffer + DVD-buffer - Lokaal netwerk Servers @@ -1336,42 +1344,42 @@ %i.0 dB Tijdnotatie Datumnotatie - GUI filters + GUI-filters - Gebruik scannen op achtergrond + Scannen op de achtergrond inschakelen Scan annuleren - Niet mogelijk tijdens scannen naar media info + Niet mogelijk tijdens scannen naar media-info Filmkorreleffect - Thumbnails in netwerkmappen zoeken + Miniaturen in netwerkmappen zoeken Onbekende types buffer - Internet Automatisch Geef gebruikersnaam voor Datum & tijd Datum instellen Tijd instellen - Geef de tijd in 24 uurs formaat (HH:MM) + Geef de tijd in 24-uursformaat (HH:MM) Geef de datum in DD/MM/YYYY formaat - Geef het IP adres + Geef het IP-adres Instellingen nu toepassen? Instellingen toepassen Bestanden hernoemen en verwijderen toestaan Tijdzone Automatische zomer-/wintertijd - Toevoegen aan favorieten - Verwijderen uit favorieten + Aan favorieten toevoegen + Uit favorieten verwijderen Skinkleuren - Tijdzone Land + Tijdzone land Tijdzone Bestandlijsten - Gebruik EXIF afbeelding informatie - Gemaximaliseerd venster in plaats van volledigscherm - Zet nummers in wachtrij na selectie - Speel geluids CD's automatisch af + EXIF-informatie gebruiken + Gemaximaliseerd venster in plaats van volledig scherm + Nummers in wachtrij zetten na selectie + Audio-CD's automatisch afspelen Afspelen DVD's - Speel DVD's automatisch af - Lettertype voor ondertiteling + DVD's automatisch afspelen + Lettertype voor ondertitels Internationaal Tekenset Debuggen @@ -1400,65 +1408,65 @@ Standaard thema Last.FM - Afgespeelde tracks bij Last.FM bijhouden - Last.FM gebruikersnaam - Last.FM wachtwoord + Afgespeelde tracks op Last.FM bijhouden + Last.FM-gebruikersnaam + Last.FM-wachtwoord Verbinding mislukt - Update XBMC a.u.b. + Werk XBMC bij aub Authentificatie mislukt: controleer gebruikersnaam en wachtwoord - Verbonden + Actief Niet verbonden - Verzend interval %i + Verzendinterval %i %i nummers gebufferd Verzenden... Verzenden over %i sec. Afspelen met... - Geleidelijke A/V Synchronisatie gebruiken - Bestandsnamen in thumbnailweergave verbergen + Geleidelijke A/V-synchronisatie gebruiken + Bestandsnamen in miniatuurweergave verbergen Afspelen in feestmix - Stuur nummers naar Libre.fm - Libre.fm gebruikersnaam - Libre.fm wachtwoord + Nummers indienen bij Libre.fm + Libre.fm-gebruikersnaam + Libre.fm-wachtwoord Libre.fm Nummer indienen - Last.FM radio aan Last.FM toevoegen + Last.FM-radio aan Last.FM toevoegen Verbinding maken met Last.FM... Station selecteren... - Zoek naar gelijksoortige artiesten... - Zoeken naar gelijksoortige tags... + Naar vergelijkbare artiesten zoeken... + Naar vergelijkbare tags zoeken... Mijn profiel (%name%) Populairste tags Favoriete artiesten van %name% Favoriete albums van %name% - Favoriete muzieknummers van %name% - Luister naar %name% op Last.fm radio - Gelijksoortige artiesten als %name% - Populairste %name% albums - Populairste %name% muzieknummers - Populairste %name% tags + Favoriete nummers van %name% + Beluister %name% op Last.fm-radio + Artiesten vergelijkbaar met %name% + Populairste albums van %name% + Populairste nummers van %name% + Populairste tags voor %name% Grootste fans van %name% - Luister naar %name% fans Last.fm radio - Luister naar gelijksoortige artiesten als %name% + Beluister de Last.fm-radio van fans van %name% + Beluister artiesten vergelijkbaar met %name% Populairste artiesten van %name% Populairste albums van %name% - Populairste muzieknummers van %name% + Populairste nummers van %name% Vrienden van %name% Buren van %name% Wekelijkse artiestenhitlijst voor %name% Wekelijkse albumhitlijst voor %name% - Wekelijkse muzieknummerhitlijst voor %name% - Luister naar de 'buren' Last.fm radio van %name% - Luister naar de persoonlijke Last.fm radio van %name% - Luister naar geliefde muzieknummers van %name% op Last.fm radio + Wekelijkse nummerhitlijst voor %name% + Beluister de 'buren' Last.fm-radio van %name% + Beluister de persoonlijke Last.fm-radio van %name% + Beluister favoriete nummers van %name% op Last.fm radio Lijst ontvangen van Last.fm... Lijst ontvangen mislukt... - Geef een artiest op om gelijksoortige artiesten te vinden - Geef een tag om gelijksoortige te vinden - Recent afgespeelde tracks door %name% - Luister naar %name%'s aanbevelingen Last.FM radio + Geef een artiest op om vergelijkbare artiesten te vinden + Geef een tag om vergelijkbare te vinden + Onlangs door %name% afgespeelde nummers + Beluister de aanbevelingen van %name% op Last.FM-radio Top tags van %name% - Luister naar %name%'s Last.FM afspeellijst radio + Beluister %name%'s Last.FM afspeellijst radio Wilt u dit nummer toevoegen aan uw favoriete nummers? Wilt u dit nummer verbannen? Toegevoegd aan favoriete nummers: %s @@ -1466,8 +1474,8 @@ Verbannen: '%s'. Verbannen van '%s' mislukt. Tracks recent gewaardeerd door %name% - Recent verbannen muzieknummers door %name% - Verwijderen uit favoriete muzieknummers + Recent verbannen nummers door %name% + Verwijderen uit favoriete nummers Ban opheffen Wilt u dit nummer verwijderen uit uw favoriete nummers? Wilt u de ban op dit nummer opheffen? @@ -1507,7 +1515,7 @@ Playlist afspelen afgebroken Eén of meer item kan niet worden afgespeeld. Voer waarde in - Controleer het log bestand voor details. + Controleer het logbestand voor details. Feestmix afgebroken. Geen overeenkomstige nummers in bibliotheek. Kan database niet initialiseren. @@ -1516,10 +1524,10 @@ Feestmix afspeellijst Alle video's - Niet bekeken video's - Bekeken video's - Markeren als bekeken - Markeren als niet-bekeken + Niet bekeken + Bekeken + Als bekeken markeren + Als niet-bekeken markeren Titel aanpassen @@ -1535,8 +1543,8 @@ Verwijderen mislukt Tenminste 1 bestand is niet verwijderd - Video Verbeter Methode - Nearest Neighbour + Videoschalingsmethode + Nearest neighbour Bilinear Bicubic Lanczos2 @@ -1584,7 +1592,7 @@ Huidige afbeelding Lokale afbeelding Geen afbeelding - Thumbnail kiezen + Miniatuur kiezen @@ -1606,16 +1614,16 @@ Naar ontgrendelde modus overschakelen Ontgrendelde modus verlaten Profiel '%s' maken? - Begin met verse begin instellingen + Begin met standaardinstellingen Beste beschikbaar - Schakel auto. om tussen 16:9 & 4:3 + Schakel autom. tussen 16:9 & 4:3 Gesplitste bestanden als één behandelen Waarschuwing Ontgrendelde modus verlaten Ontgrendelde modus inschakelen - Allmusic.com thumbnail + Allmusic.com-miniatuur - Thumbnail verwijderen + Miniatuur verwijderen Profiel toevoegen... Info opvragen voor alle albums Media-info @@ -1630,7 +1638,7 @@ Kan map niet creëren Profiellocatie Met verse mediabronnen beginnen - Controleer of de gekozen locatie beschrijfbaar is + Controleer of u schrijfrechten heeft op de gekozen locatie en of de nieuwe mapnaam geldig is MPAA-waardering: Voer vergrendelcode in @@ -1685,11 +1693,11 @@ Glazen vullen Ingelogd als Uitloggen - Ga naar beginscherm + Naar beginscherm gaan Weven Weven (omgekeerd) Overgaan - Herstart Video + Herstart video Netwerklocatie wijzigen Netwerklocatie verwijderen Wilt u de map doorzoeken? @@ -1717,7 +1725,7 @@ DVD-ROM-informatie Netwerkinformatie Videoinformatie - Hardwareinformatie + Hardware-informatie Totaal Gebruikt van @@ -1741,8 +1749,8 @@ Backspace Spatie Skin herladen - Draaien m.b.v. EXIF-informatie - Posterstijl voor TV-serie gebruiken + Draaien op basis van EXIF-informatie + Posterstijl voor series gebruiken Even geduld... @@ -1812,51 +1820,51 @@ Wilt u alle items in deze map verwijderen uit de bibliotheek? Films - TV-series + Series Deze map bevat - Automatische scan uitvoeren + Automatisch scannen Ook onderliggende mappen scannen als Regisseurs Geen videobestanden gevonden in deze map! stemmen - Informatie TV-serie - Informatie aflevering - Details TV-serie laden + Serie-info + Afleveringsinfo + Details serie laden Afleveringengids ophalen - Afleveringinformatie naar map laden - Selecteer TV-serie: - Geef de naam van de TV-serie + Afleveringsinfo naar map laden + Selecteer serie: + Geef de naam van de serie Seizoen %i - Afl. - Afl. + Afl. + Afl. Afleveringsdetails laden - Verwijder aflevering uit bibliotheek - Verwijder TV-serie uit bibliotheek - TV-serie + Aflevering uit bibliotheek verwijderen + Serie uit bibliotheek verwijderen + Serie Afleveringsplot * Alle seizoenen - Verberg bekeken + Bekeken verbergen Prod. - Plot van niet-bekeken video's verbergen + Plot van niet-bekeken video's weergeven * Verborgen om plot niet te verklappen * Afbeelding seizoen selecteren - Afbeelding van Seizoen + Afbeelding van seizoen Seizoen Video-informatie ophalen Inhoud ontkoppelen Originele titel - TV-serie-informatie vernieuwen + Serie-informatie vernieuwen Alle afleveringen vernieuwen? - Map bevat één enkele TV-serie + Geselecteerde map bevat één enkele serie Map uitsluiten van scans Specials - Automatisch thumbnails van seizoen laden - Map bevat 1 video - Link naar TV-serie - Link naar TV-serie verwijderen - Onlangs toegevoegde speelfilms - Onlangs toegevoegde afleveringen TV-series + Automatisch miniaturen van seizoen laden + Geselecteerde map bevat 1 video + Aan serie koppelen + Van serie loskoppelen + Onlangs toegevoegde films + Onlangs toegevoegde afleveringen series Filmstudio's Muziekvideo's Onlangs toegevoegde muziekvideo's @@ -1875,22 +1883,22 @@ Acteursafbeelding instellen Afl. uit favorieten verwijderen - Voeg afl. toe aan favorieten + Afl. aan favorieten toevoegen Scraperinstellingen Muziekvideo-informatie ophalen - TV-serieinformatie ophalen + Serie-info ophalen Trailer Eenvoudige weergave - Verberg seizoenen bij één seizoen - Download fanart - Laat fanart zien in videobibliotheek + Seizoenen verbergen indien één seizoen + Fanart downl. + Fanart in video- en muziekbibliotheek tonen Bezig met scannen naar nieuwe inhoud - Eerste keer uitgezonden + Eerst uitgez. Schrijver Bestands- en mapnamen opschonen Nooit - Alleen bij één seizoen + Alleen indien één seizoen Altijd Trailer Onwaar @@ -1899,13 +1907,13 @@ bestanden per entry? Enkel bestand Apart - Thumbs en fanart exporteren? + Miniaturen en fanart exporteren? Oude bestanden overschrijven? Pad uitsluiten van bibliotheekupdates - Thumbs en vlaggen extraheren + Miniaturen en vlaggen extraheren Sets Filmsetthumb kiezen - Acteurthumbs exporteren + Acteurminiaturen exporteren Fanart kiezen Lokale fanart Geen fanart @@ -1946,7 +1954,7 @@ Muis inschakelen Navigatiegeluiden afspelen tijdens afspelen van media - Thumbnail + Miniatuur DVD-regiocode forceren Videohardware Beeldverhouding @@ -1959,7 +1967,7 @@ Geef naam voor de intelligente afspeellijst 'Locatie toevoegen' weergeven Schuifbalken weergeven - 'Verberg bekeken'-knop toevoegen in bibliotheek + 'Bekeken verbergen'-knop toevoegen in bibliotheek Openen Akoestiekbeheerniveau Snel @@ -1989,35 +1997,35 @@ niet in laatste Scrapers Standaard filmscraper - Standaard tv-seriescraper + Standaard seriescraper Standaard muziekvideoscraper Fallback gebaseerd op scrapertaal - Instellingen Meertalig Geen scrapers beschikbaar Waarde gelijk aan - Intelligente afspeellijst regel + Intelligente-afspeellijstregel Nummers zijn gelijk wanneer Nieuwe regel... Muziek moet gelijk aan elk van deze regels een of meer van deze regels - Beperk tot + Beperken tot Geen beperking - Sorteer op + Sorteren op oplopend aflopend - Wijzig intelligente afspeellijst + Intelligente afspeellijst wijzigen Naam van de afspeellijst Zoek muziek gelijk aan Wijzigen - %i muzieknummers + %i nummers Nieuwe intelligente afspeellijst... %c schijf Feestmix instellen - Home map + Startmap Aantal bekeken - Afl. titel + Titel afl. Videoresolutie Audiokanalen Videocodec @@ -2034,10 +2042,10 @@ Pad Bestandsgrootte Laatst gewijzigd - Dia index + Dia-index Resolutie Opmerking - Kleur/zwartwit + Kleur/zwart-wit JPEG-proces Datum/tijd @@ -2087,14 +2095,14 @@ Landcode Brondiensten UPnP-rendering inschakelen - Probeer direct naar het DVD-menu te gaan + Direct naar het DVD-menu proberen te gaan Geripte muziekalbums Info over alle artiesten zoeken Albuminformatie ophalen Artiestinformatie ophalen Biografie Discografie - Zoekt Artiest + Zoekt artiest Artiest selecteren Artiestinformatie Instrumenten: @@ -2116,15 +2124,15 @@ %2.3fs Eerder %2.3fs Later %2.3fs - Synchroniseer ondertitels + Ondertitels synchroniseren OpenGL-leverancier: - OpenGL-render: + OpenGL-renderer: OpenGL-versie: - GPU-temperatuur: - CPU-temperatuur: - Totale geheugenhoeveelheid: + Temperatuur: + Temperatuur: + Aanwezig geheugen Profieldata - "Dimmen" bij gepauzeerde video + Scherm dimmen bij gepauzeerde videoweergave Alle opnames Op titel Op groep @@ -2132,12 +2140,12 @@ Opnames op titel Gids Toegestane afwijking in beeldverhouding (%) - Voeg videobestanden in lijsten + Toon videobestanden in lijst DirectX-leverancier: Direct3D-versie - Font + Lettertype - Grootte - Kleuren - Karakterset @@ -2146,20 +2154,20 @@ Karaoketitels importeren Auto popup nummerselectie Karaoketitels exporteren... - Voer nummer in + Nummer invoeren wit/groen wit/rood wit/blauw zwart/wit - Standaard selectie actie - Kies - Laat informatie zien + Standaardactie bij selecteren + Kiezen + Informatie tonen Meer... Alles afspelen Teletekst niet beschikbaar - Activeer teletekst + Teletekst activeren Stuk %i %i bytes bufferen Instellingen ontbreken @@ -2183,9 +2191,9 @@ Script Visualisatie Add-on repo - Ondertitelingscraper - Lyricsscraper - TVinformatie + Ondertitelscraper + Songtekstscraper + TV-informatie Muziekvideoinformatie Albuminformatie Artiestinformatie @@ -2203,11 +2211,11 @@ Controleren op updates Verversen Wijzigingen - Deinstalleren + Verwijderen Installeren Uitgeschakelde add-ons (Huidige instellingen wissen) - Installeren van zipbestand + Installeren via zipbestand Downloaden van %i%% Beschikbare updates @@ -2220,11 +2228,11 @@ Wilt u deze add-on uitschakelen? Er is een update voor deze add-on! Geïnstalleerde add-ons - Automatische updates + Automatisch bijwerken Add-on is ingeschakeld Add-on is bijgewerkt - Download add-on stoppen - Bezig met downloaden van de volgende add-ons + Ophalen add-on stoppen + Bezig met het ophalen van de volgende add-ons Update beschikbaar Update @@ -2244,9 +2252,9 @@ Uitgeschakelde systeem add-on - Add-on is gemarkeerd als niet werkend in de repository. - Wilt u de add-on uitschakelen op het systeem? - Werkt niet + Add-on is gemarkeerd als niet werkend in het repository. + Wilt u de add-on uitschakelen? + Defect Bibliotheekmodus @@ -2269,7 +2277,7 @@ Opslaan Kopiëren Geef downloadmap op - Zoek tijdsduur + Zoek tijdsduur Kort Lang Gebruik DVD-speler in plaats van standaardspeler @@ -2305,7 +2313,7 @@ Seizoenen Gebruik je Bekijk je - Luister naar + Beluister Bekijk je Configureer de Power @@ -2329,7 +2337,7 @@ Liefde Haat - Dit bestand bestaat uit meerdere delen, selecteer het juiste deel. + Dit bestand bestaat uit meerdere delen, selecteer het deel dat u wilt afspelen. Pad naar script Stel aangepaste scriptknop in @@ -2339,7 +2347,7 @@ Wav DXVA2 VAAPI - Flac + FLAC Luidsprekerkanalen 2.0 diff -Nru xbmc-10.00~svn33778/language/English/strings.xml xbmc-10.00~svn34731/language/English/strings.xml --- xbmc-10.00~svn33778/language/English/strings.xml 2010-09-10 06:40:31.000000000 +0000 +++ xbmc-10.00~svn34731/language/English/strings.xml 2010-10-10 20:14:50.000000000 +0000 @@ -1,5 +1,5 @@ - + Programs Pictures @@ -87,7 +87,8 @@ Create thumbnails Shortcuts Paused - + Update failed + Installation failed Copy Move Delete @@ -563,6 +564,8 @@ CDDARipPath is not set. Rip audio track Enter number + Bits/Sample + Sample Frequency Audio CDs Encoder @@ -2270,7 +2273,7 @@ Saving Copying Set download directory - Search duration + Search duration Short Long Use DVD player instead of regular player diff -Nru xbmc-10.00~svn33778/language/French/strings.xml xbmc-10.00~svn34731/language/French/strings.xml --- xbmc-10.00~svn33778/language/French/strings.xml 2010-09-03 15:13:03.000000000 +0000 +++ xbmc-10.00~svn34731/language/French/strings.xml 2010-10-11 19:23:56.000000000 +0000 @@ -1,5 +1,5 @@ - + Programmes Images @@ -87,7 +87,8 @@ Créer vignettes Raccourcis PAUSE - + Echec Mise-à-jour + Echec Installation Copier Déplacer Effacer @@ -172,6 +173,7 @@ Sélection film : Demande d'info sur %s Chargement des détails du film + Interface Web Critiques Intrigue @@ -562,6 +564,8 @@ Le chemin CDDA d'importation n'est pas défini. Importer une piste audio Entrer numéro + Bits/Sample + Fréquence d'échantillonage CDs audio Encodeur @@ -846,7 +850,7 @@ Passer en économie d'énergie en cas d'inactivité - Durée : + Durée Échec du script ! : %s Nouvelle version requise - Voir le log @@ -1019,6 +1023,7 @@ Redémarrer Minimiser Action bouton Power + Arrêt du système Une autre session est en cours, peut être en ssh ? Disque dur externe monté @@ -1091,8 +1096,8 @@ Jamais Immédiatement Après %i secs - Installé le : - Nombre de cycles marche/arrêt complets : + HDD Installé le : + HDD Nbr. de cycles marche/arrêt complets : Profils Supprimer le profil '%s' ? @@ -1272,6 +1277,11 @@ Haute Vraiment élevé (lent !) Synchro. lecture avec affichage + + Pause pendant le changement de fréquence + Off + %.1f Seconde + %.1f Secondes Télécommande Apple @@ -1516,8 +1526,8 @@ Playliste Mix de soirée Toutes les vidéos - Vidéos non vues - Vidéos vues + Non vues + Vues Marquer comme vu Marquer comme non vu Éditer le titre @@ -1632,7 +1642,7 @@ Démarrer avec de nouvelles sources Média Vérifier que l'écriture est possible dans le dossier sélectionné et que le nom du nouveau dossier est valide - Avis MPAA : + Avis MPAA Entrer le code du mode Admin. Demander le code du mode Admin. au démarrage Param. Thèmes @@ -1768,6 +1778,7 @@ Première connexion, modifier votre profile Client HTS Tvheadend Client VDR Streamdev + Client MythTV Dossier Server Web (HTTP) Dossier Server Web (HTTPS) @@ -2353,4 +2364,4 @@ 7.1 - \ No newline at end of file + diff -Nru xbmc-10.00~svn33778/language/German/strings.xml xbmc-10.00~svn34731/language/German/strings.xml --- xbmc-10.00~svn33778/language/German/strings.xml 2010-08-20 14:18:53.000000000 +0000 +++ xbmc-10.00~svn34731/language/German/strings.xml 2010-10-11 22:03:16.000000000 +0000 @@ -52,6 +52,24 @@ Nov Dez + N + NNO + NO + ONO + O + OSO + SO + SSO + S + SSW + SW + WSW + W + WNW + NW + NNW + VAR + Autoansicht Große Autoansicht Symbolansicht @@ -67,7 +85,8 @@ Thumbnail wird erstellt Verknüpfungen Pause - + Update fehlgeschlagen + Installation fehlgeschlagen Kopieren Verschieben Löschen @@ -123,7 +142,7 @@ Auflösung - Bildwiederholungsrate anpassen + Bildwiederholfrequenz anpassen Veröffentlichung @@ -152,9 +171,11 @@ Film-Auswahl: Online-Datenbank wird abgefragt... Lade Filminformationen + Web Benutzerschnittstelle Kurzinfo Handlung + Stimmen: Besetzung Handlung @@ -175,7 +196,7 @@ Testbilder... Audio CD Titelnamen mit freedb.org abgleichen - Zufällige Reihenfolge der Playliste nach dem Laden + Zufällige Reihenfolge der Playlist nach dem Laden Festplatten Abschaltzeit Videofilter Keine @@ -186,11 +207,13 @@ Gaussian Cubic Verkleinerung Vergrößerung - Playliste nach der Wiedergabe löschen + Playlist nach der Wiedergabe löschen Anzeige Vollbild #%d Fenster Bildwiederholrate + Vollbild + Anpassen: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixel: %2.2f:1) Skripte Sprache @@ -208,9 +231,9 @@ Shoutcast Warte auf Start... Skript-Ausgabe - Webserver aktivieren + Erlaube Kontrolle von XBMC über HTTP Aufnehmen - Aufnahme-Stop + Aufnahme beenden Nach: Titel-Nr. Nach: Zeit Nach: Titel @@ -226,7 +249,7 @@ Ändere das Rechteck so, daß es ein perfektes Quadrat ergibt Einstellungen können nicht geladen werden Standardeinstellungen verwenden - Bitte überprüfe die .xml-Dateien + Bitte überprüfe die XML-Dateien %i Einträge gefunden Suchergebnisse Keine Ergebnisse gefunden @@ -235,7 +258,7 @@ Schriftart - Schriftgröße Dynamische Kompression - Videos + Video Audio Nach Untertitel durchsuchen Lesezeichen erstellen @@ -246,10 +269,10 @@ - Receiver unterstützt MP1 - Receiver unterstützt MP2 - Receiver unterstützt MP3 - Untertitel-Verzögerung + Verzögerung Sprache Aktiviert - Paralleles Audio/Video + Nicht-interleaved @@ -347,8 +370,8 @@ Wind Taupunkt Feuchtigkeit - von - mit + + Standards Verbinde mit Wetterservice Erhalte Wetter-Informationen für: @@ -374,6 +397,7 @@ Keinen Cache verwenden Film aus der Datenbank entfernen Soll '%s' wirklich entfernt werden? + Von %s mit %i %s Wechsellaufwerk Öffne Datei @@ -407,12 +431,12 @@ Typ Die Leiste bewegen, um die OSD-Position einzustellen OSD-Position - Credits + Anerkennung Modchip Aus nur Musik Musik & Video - Playliste konnte nicht geladen werden + Playlist konnte nicht geladen werden OSD Skin und Sprache Darstellung @@ -450,7 +474,7 @@ Zuletzt gespielte Alben Starten Starten als... - XBE-Titel ändern + Sampler Quelle entfernen Medium wechseln @@ -505,7 +529,7 @@ Studio Pfad Land - Im Gange + In Gange Sortierrichtung Sortiermethode @@ -532,6 +556,7 @@ Höchste Qualität konstante Bitrate Kopieren... + Zielordner: CD oder Titel konnte nicht kopiert werden! CD Ziel-Pfad ist nicht konfiguriert. @@ -598,7 +623,7 @@ - Zuweisung der IP-Adresse Automatisch (DHCP) Manuell (Statisch) - Standard (Dashboard) + - IP-Adresse - Subnetzmaske - Standardgateway @@ -719,13 +744,13 @@ Untermenü Untermenü-Einträge aktivieren Favoriten - Video-Plugins - Musik-Plugins - Bilder-Plugins + Video Add-ons + Musik Add-ons + Bilder Add-ons Ordner wird geladen %i Einträge geladen %i von %i Einträgen geladen - Programm-Plugins + Programm Add-ons Setze Plugin Thumbnail Plugin-Einstellungen Zugangspunkte @@ -768,13 +793,14 @@ Programme & Bilder & Musik Programme & Bilder & Videos - FTP-Benutzername - FTP-Passwort - Das Passwort wurde erfolgreich gesetzt. + + + Automatische erkennung Andere Systeme erkennen Nickname + Nachfragen ob eine Verbindung aufgebaut werden soll FTP-Benutzername und -Passwort senden Ping-Intervall @@ -810,6 +836,9 @@ Gewitter Gewitterregen Mäßig + Sehr Hoch + Windig + Dunst Aktiviere Energiesparmodus bei Leerlauf @@ -817,8 +846,8 @@ Script-Fehler! : %s Neuere Version benötigt - Siehe Logfile - Grafikkarte - Vorraussetzungen nicht erfüllt - Siehe Logfile + + LCD/VFD benutzen @@ -848,8 +877,8 @@ Videos/Playlisten Einstellungen->Profile - JA/NEIN-Dialog - Fortschrittsdialog + Ja/Nein Dialog + Fortschrittsanzeige Suche nach Untertiteln... Zwischenspeichern der Untertitel... @@ -921,7 +950,7 @@ Bitte Passwort zum Entsperren eingeben oder mit C abbrechen Bitte die Gamepad-Tastenkombination eingeben - und mit der 'Start'-Taste bestätigen. Um abzubrechen, 'Back'-Taste drücken. + und mit der 'Ok'-Taste bestätigen. Um abzubrechen, 'Back'-Taste drücken. Sperren Entsperren Sperre zurücksetzen @@ -951,9 +980,9 @@ Alle vorherigen Werte werden damit überschrieben Anzeigedauer eines Bildes Schwenk- und Zoom-Effekte verwenden - NTSC-Videos nach PAL - PAL-Videos nach NTSC - NTSC-Videos nach PAL60 + + + 12 Stunden Uhr 24 Stunden Uhr Tag/Monat @@ -976,8 +1005,8 @@ - Verzögerung - minimale Dauer der Datei Ausschalten - Dashboard - Individuellen Dashboard-Pfad verwenden + + Funktion für 'Ausschalten' Beenden Ruhezustand @@ -995,15 +1024,17 @@ Joystick ausgesteckt Der Akku ist fast leer + Flicker-Filter - Wähle Treiber (benötigt Neustart) - Vertical Blank Sync + Wie Treiber (benötigt Neustart) + Vertical Blank Synchronisation Deaktiviert - Aktiviere während der Videowiedergabe + Aktiviert während der Videowiedergabe Immer aktiviert Teste Auflösung Auflösung speichern? Soll diese Auflösung beibehalten werden? + Hochauflösende Software-Hochskalierung Deaktiviert Nur für SD-Inhalte aktivieren @@ -1022,38 +1053,38 @@ Aktive Verbindungen festgestellt! Wird fortgefahren, kann XBMC möglicherweise nicht mehr - gesteuert werden. Fernsteuerung wirklich stoppen? + gesteuert werden. Fernsteuerung wirklich beenden? Wechsle Apple-Remote-Modus? Wird aktuell Apple Remote zur Steuerung von XBMC verwendet, zieht ein Wechseln dieser Einstellung den Verlust der Steuerung nach sich. Soll fortgefahren werden? - Schlüssel: - Temperatur: - Modell: - Firmware: - Modell: - Seriennummer: - Firmware: - Passwort: - Festplattensperre: + + + + + + + + + Subnetzmaske Gateway Primärer DNS-Server Initialisierung fehlgeschlagen - Gamepad - Tastatur - Maus - Kopfhörer/Mikrofon - MemoryStick - Fernbedienung - Controller Port + + + + + + + Nie Sofort Nach %i Sek - Herstellungsdatum: - Einschaltanzahl: + HD Installations-Datum: + HD Anzahl Einschaltungen: Profile Soll das Profil '%s' wirklich gelöscht werden? @@ -1065,6 +1096,8 @@ Gestartet, Alarm in %im Alarm! Deaktiviert. Restzeit war %im%is. + %2.0fm + %2.0fs Untertitel in RAR-Dateien suchen Untertitel suchen... @@ -1194,7 +1227,7 @@ Titelposition anzeigen Standard entfernen Fortsetzen - Cover Download + Lade Poster Bildinformation %s Voreinstellungen (IMDb Benutzer-Bewertung) @@ -1220,6 +1253,7 @@ Hardwarebeschleunigung erlauben (CrystalHD) Hardwarebeschleunigung erlauben (VDADecoder) Hardwarebeschleunigung erlauben (OpenMax) + Pixel Shaders A/V Sync Methode Audio Takt @@ -1233,6 +1267,11 @@ Sehr Hoch(langsam!) Synchronisiere Wiedergabe zur Anzeige + Pause während der Wiederholfrequenz Änderung + Aus + %.1f Sekunden + %.1f Sekunden + Apple-Remote XBMC Start mit Fernbedienung erlauben @@ -1284,7 +1323,7 @@ Netzwerkeinstellungen wurden geändert XBMC muss neu gestartet werden, damit die Änderung wirksam wird. Soll jetzt neu gestartet werden? - Nachbearbeitung + - Auch während der Wiedergabe ausschalten %i Min %i Sek @@ -1298,7 +1337,7 @@ GUI-Filter Durchsuchen im Hintergrund - Scan unterbrechen + Scan beenden Nicht möglich während des Durchsuchens Filmkörnungseffekt Netzwerkquellen nach Thumbnails durchsuchen @@ -1513,6 +1552,7 @@ Automatisch Zeitlich (Hälfte) Zeitlich/Räumlich (Hälfte) + DXVA Video Nachbearbeitung Deaktiviert @@ -1718,6 +1758,8 @@ WebDAV server (HTTP) WebDAV server (HTTPS) Erster Login: Bearbeite dein Profil. + HTS Tvheadend Client + VDR Streamdev Client Webserver-Verzeichnis (HTTP) Webserver-Verzeichnis (HTTPS) @@ -1725,14 +1767,14 @@ Export Überspringen und fortsetzen? RSS Feed - Unbekannt. Bitte MD5-Prüfsumme von xbmc.log zu BiosIDs.ini hinzufügen. + Sekundärer DNS-Server DHCP-Server Neuer Ordner LCD während der Wiedergabe ausschalten Unbekannt oder OnBoard (geschützt) - Während 'Pause' das LCD wieder einschalten - Während 'Pause' die LED wieder einschalten + Während 'Pause' das LCD dimmen + Videodatenbank Sortiert nach ID @@ -1868,7 +1910,7 @@ Lokal gespeicherte Informationen gefunden. Ignorieren und neu aus dem Internet laden? Informationen können nicht herunter geladen werden - Der Server ist wahrscheinlich nicht verfügbar. + Es kann keine Verbindung zum Server hergestellt werden Wollen Sie mit der Aktualisierung fortfahren? Länder Episode @@ -1877,7 +1919,7 @@ Versteckte Ordner und Dateien anzeigen TuxBox Client WARNUNG: Ziel-TuxBox-Laufwerk ist im Aufnahme-Modus! - Der Stream wird gestoppt! + Der Stream wird beendet! Umschalten auf Kanal: %s fehlgeschlagen! Den Stream jetzt starten? Verbinden zu: %s @@ -1903,7 +1945,7 @@ 480p-Auflösung aktivieren 720p-Auflösung aktivieren 1080i-Auflösung aktivieren - Bitte einen Namen für die Playliste eingeben + Bitte einen Namen für die Playlist eingeben 'Quelle hinzufügen'-Symbol im Haupt-Ordner anzeigen Scrollbalken aktivieren Filter für 'Gesehen' als Einstellung in Datenbank aktivieren @@ -1920,7 +1962,7 @@ Es ist nicht möglich, Dateien größer als 4GB zwischenzuspeichern! Kapitel Pixelshader V2 (Hohe Qualität) - Playliste beim Einschalten abspielen + Playlist beim Einschalten abspielen Zwischenanimationen aktivieren beinhaltet beinhaltet nicht @@ -1955,11 +1997,11 @@ Aufsteigend Absteigend Smart-Playlist-Editor - Name der Playliste + Name der Playlist Suche passende Titel anhand Bearbeiten %i Titel - Neue Smart Playliste... + Neue Smart Playlist... %c Laufwerk Party-Modus-Regeln editieren Home-Ordner @@ -2055,9 +2097,10 @@ Geboren/Gegründet Aktualisiere Datenbank beim Start - Datenbank immer im Hintergrund aktualisieren + Fortschritt von Datenbank-Aktualisierungen verbergen DNS Suffix + %2.3fs Verzögert um: %2.3fs Beschleunigt um: %2.3fs Untertitelabstand @@ -2105,7 +2148,7 @@ Videotext aktivieren Teil %i Zwischenspeichern - %i Bytes - Wird gestoppt + Wird beendet Läuft Externer Player ist aktiv @@ -2154,14 +2197,14 @@ Verfügbare Add-ons Version: - Disclaimer + Haftungsausschluss Lizenz: Änderungen Wollen Sie dieses Add-on aktivieren? Wollen Sie dieses Add-on deaktivieren? Neue Version des Add-on verfügbar! Aktivierte Add-ons - Automatische Aktualisierung + Auto Update Add-on aktiviert Add-on aktualisiert Herunterladen des Add-on abbrechen? @@ -2169,8 +2212,8 @@ Aktualisierung verfügbar Aktualisierung - Das Add-on kann nicht verwendet werden - Ein unbekannter Fehler ist aufgetreten + Das Add-on kann nicht geladen werden. + Ein unbekannter Fehler ist aufgetreten. Einstellungen fehlen oder sind ungültig Die Verbindung kann nicht hergestellt werden Neustart erforderlich @@ -2195,7 +2238,6 @@ - Suchdauer Trailer Qualität Streamen Herunterladen @@ -2206,6 +2248,7 @@ Speichern Kopieren Download-Ordner wählen + Suchdauer Kurz Lang Benutze DVDplayer statt dem regulären diff -Nru xbmc-10.00~svn33778/language/Greek/strings.xml xbmc-10.00~svn34731/language/Greek/strings.xml --- xbmc-10.00~svn33778/language/Greek/strings.xml 2010-09-03 15:13:03.000000000 +0000 +++ xbmc-10.00~svn34731/language/Greek/strings.xml 2010-10-04 17:44:50.000000000 +0000 @@ -1,7 +1,10 @@ - - + + + + + Εφαρμογές Φωτογραφίες @@ -83,6 +86,8 @@ Δημιουργία μικρογραφιών Συντομεύσεις Παύση + Η ενημέρωση απέτυχε + Η εγκατάσταση απέτυχε Αντιγραφή Μετακίνηση Διαγραφή @@ -162,6 +167,7 @@ Επιλογή ταινίας: Αναζήτηση πληροφοριών %s Φόρτωση πληροφοριών ταινίας + Διεπαφή ιστού Σύνθημα Περίληψη πλοκής Ψήφοι: @@ -356,8 +362,6 @@ Άνεμος Σημείο δρόσου Υγρασία - Από - με ένταση Προεπιλεγμένα Πρόσβαση στο Weather.com Πληροφορίες καιρού: @@ -367,8 +371,8 @@ Λήψη μικρογραφίας... Μη διαθέσιμος πόρος Προβολή: Εικόνες - Χαμηλή - Υψηλή + Ελαχ. + Μεγ. HDMI Διαγραφή πληροφοριών άλμπουμ Διαγραφή πληροφοριών CD @@ -539,6 +543,8 @@ Δεν ορίσθηκε διαδρομή εξαγωγής CDDA. Εγγραφή κομματιού Εισαγωγή αριθμού + Bits/Sample + Συχνότητα δειγματοληψίας CDs ήχου Κωδικοποιητής Ποιότητα @@ -930,6 +936,7 @@ Επανεκκίνηση Ελαχιστοποίηση Ενέργεια πλήκτρου λειτουργίας + Απενεργοποίηση Είναι ενεργή άλλη συνεδρία (ίσως μέσω ssh); Προσάρτηση αναιρούμενου δίσκου Επισφαλής αφαίρεση συσκευής @@ -1141,6 +1148,10 @@ Υψηλή Πραγματικά υψηλή (αργή!) Συγχρονισμός αναπαραγωγής ήχου κατά τη προβολή + Παύση κατά τη διάρκεια ανανέωσης + Ανενεργή + %.1f δευτερόλεπτο + %.1f δευτερόλεπτα Apple Remote Έγκριση έναρξης του XBMC μέσου απομακρυσμένου ελέγχου Ακολουθία χρόνου καθυστέρησης @@ -1395,9 +1406,6 @@ Χρονική/Χωρική (κατά το ήμισυ) DXVA Μετα-επεξεργασία βίντεο - Ανενεργή - Ενεργή για τυπική ευκρίνεια (SD) - Πάντα ενεργή Προβολή λήξης χρόνου αναστόλης Αλλαγή καναλιού Φάκελος αποθήκευσης μουσικής @@ -2022,7 +2030,6 @@ Λειτουργία συλλογής Διάταξη πληκτρολογίου QWERTY Σε λειτουργία η διέλευση ήχου - Αναζήτηση διάρκειας Ποιότητα διαφημιστικού Ροή πολυμέσων Λήψη @@ -2033,6 +2040,7 @@ Αποθήκευση Αντιγραφή Ορισμός φακέλου λήψης + Αναζήτηση διάρκειας Σύντομος Εκτεταμένος Ορισμός αναπαραγωγέα DVD αντί του κανονικού diff -Nru xbmc-10.00~svn33778/language/Hungarian/strings.xml xbmc-10.00~svn34731/language/Hungarian/strings.xml --- xbmc-10.00~svn33778/language/Hungarian/strings.xml 2010-09-12 08:27:04.000000000 +0000 +++ xbmc-10.00~svn34731/language/Hungarian/strings.xml 2010-09-30 10:17:21.000000000 +0000 @@ -1,9 +1,9 @@ - - - + + + Program Képek @@ -91,7 +91,8 @@ Bélyegképek létrehozása Parancsikonok Szünet - + A frissítés nem sikerült + A telepítés nem sikerült Másolás Áthelyezés Törlés @@ -176,6 +177,7 @@ Film választás: %s lekérdezése Filminformációk betöltése + Webes kezelőfelület Röviden Tartalom @@ -566,6 +568,8 @@ CDDA bemásolási mappa nincs beállítva. Zeneszám bemásolása Szám megadása + Bitszám/minta + Mintavételi frekvencia Zenei CD Kódoló @@ -1277,6 +1281,11 @@ Nagyon magas(lassú!) Lejátszás szinkronizálása a megjelenítőhöz + Videó megállítása a frekvenciaváltás alatt + Kikapcsolva + %.1f másodperc + %.1f másodperc + Apple távirányító XBMC indítható legyen távirányítóval @@ -2156,7 +2165,7 @@ fekete/fehér Alapértelmezett kiválasztási művelet - Lejátszás + Választás Információ mutatása Több... Összes játszása diff -Nru xbmc-10.00~svn33778/language/Italian/strings.xml xbmc-10.00~svn34731/language/Italian/strings.xml --- xbmc-10.00~svn33778/language/Italian/strings.xml 2010-07-21 15:21:49.000000000 +0000 +++ xbmc-10.00~svn34731/language/Italian/strings.xml 2010-09-18 18:15:26.000000000 +0000 @@ -1,9 +1,10 @@ - - - - - + + + + + + Programmi Immagini @@ -15,7 +16,6 @@ File Meteo xbmc media center - Lunedì Martedì Mercoledì @@ -23,7 +23,6 @@ Venerdì Sabato Domenica - Gennaio Febbraio Marzo @@ -36,7 +35,6 @@ Ottobre Novembre Dicembre - Lun Mar Mer @@ -44,7 +42,6 @@ Ven Sab Dom - Gen Feb Mar @@ -57,7 +54,13 @@ Ott Nov Dic - + SSO + SO + OSO + O + ONO + NO + NNO Vedi: Auto Vedi: Auto grande Vedi: Icone @@ -73,7 +76,8 @@ Crea le icone Collegamenti Pausa - + Aggiornamento fallito + Installazione fallita Copia Sposta Elimina @@ -126,18 +130,16 @@ Senza disco Disco presente Skin - - Abilita sincronizzazione orario da Internet + + Risoluzione Regola la frequenza di aggiornamento - - + + Data di uscita: Mostra video 4:3 come - Atteggiamenti Stili - Canzone Durata Seleziona l'album @@ -158,10 +160,9 @@ Seleziona il film: Richiesta %s informazioni Caricamento dettagli del film - + Interfaccia web Tema Sintesi - Voti: Attori Trama @@ -179,7 +180,6 @@ Rete non connessa Annulla Velocità - Immagine di prova Cerca i nomi delle tracce audio su freedb.org Mescola playlist all'avvio @@ -198,7 +198,8 @@ Schemo Intero #%d In Finestra Frequenza di Refresh - + Schermo intero + Dimensione: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixel: %2.2f:1) Scripts Lingua Musica @@ -229,7 +230,7 @@ Posizione sottotitoli Regolazione pixel ratio Muovi le frecce sul bordo per impostare l'overscan - Muovi la riga per la posizione dei sottotitoli + Muovi la riga per la posizione dei sottotitoli Ridimensiona il rettangolo finché non vedi un quadrato perfetto Impossibile caricare le impostazioni Utilizza le impostazioni originali @@ -237,7 +238,8 @@ Trovato/i %i elemento/i Risultati della ricerca Ricerca fallita - + + Sottotitoli Carattere - Dimensione @@ -257,11 +259,16 @@ Lingua Attivo Non-interlacciato - - - - - + + + + + + + + + + (0=auto) Riorganizza archivio Preparazione... @@ -289,7 +296,7 @@ Conversione framerate Uscita audio Analogica - Digitale + Ottico/Coass. Artisti vari Avvia disco Film @@ -354,8 +361,6 @@ Vento P. di rugiada Umidità - Da - a Predefinitio Accesso a servizio meteo Aggiorno le previsioni meteo per: @@ -368,7 +373,6 @@ Basso Alto HDMI - Elimina le info sull'album Elimina info CD Seleziona @@ -381,7 +385,7 @@ Nessuna cache Eliminare il film dal archivio Sicuro di voler cancellare '%s'? - + Da %s a %i %s Disco rimuovibile Apertura file Cache @@ -425,7 +429,6 @@ Aspetto Opzioni audio Informazioni su XBMC - Elimina album Ripeti Ripeti una volta @@ -453,11 +456,11 @@ Schermata Home Impostazioni manuali Genere - Album riprodotti di recente Avvia Avvia in... - + + Compilations Rimuovi sorgente Cambia media @@ -486,7 +489,6 @@ Dispositivo d'uscita passtrough Nessuna biografia per questo artista Converti l'audio multicanale in stereo - Ordina per: %s Nome Data @@ -513,7 +515,6 @@ Percorso Nazione In corso - Direzione ordinamento Metodo di ordinamento Modalità di visualizzazione @@ -532,20 +533,17 @@ Ripeti: Inattivo Ripeti: Uno Ripeti: Tutto - Rip CD audio Medio Standard Estremo Bit rate costante Rip in corso... - A: Impossibile rip del CD o della traccia Il percorso CDDARip non è impostato Rip traccia audio Inserire numero - CD Audio Codificatore Qualità @@ -583,30 +581,26 @@ Cerca cartella Informazioni canzone Adattamento non lineare - Amplificazione volume Selez. cartella esportazione Questo file non è più disponibile. Vuoi rimuoverlo dall'archivio? Cerca Script Livello Compressione - Pulisci l'archivio Eliminazione vecchie canzoni dall'archivio Questo percorso è già stato esaminato in precedenza. Rete - Server - Usa un server proxy HTTP per accedere a internet - Internet Protocol (IP) Porta specificata non valida. Inserire un valore compreso tra 1 and 65535. HTTP proxy - - Assegnazione Automatico (DHCP) Manuale (Static) - + + - Indirizzo IP - Netmask - Default gateway @@ -617,9 +611,7 @@ Modifiche non salvate. Continuare senza salvare? Web server FTP server - Internet time - Porta - Indirizzo time server Salva e applica - Password Nessuna password @@ -640,12 +632,10 @@ Rifletti immagine Sei sicuro? Rimuovo sorgente - Aggiungi collegamento Modifica percorso Modifica nome programma Modifica profondità percorso - Visualizza: Lista grande Giallo Bianco @@ -653,12 +643,11 @@ Verde Giallo/verde Azzurro - Reserved - Reserved - - + Grigio chiaro + Grigio Errore %i: condivisione non disponibile - + + Uscita audio Cercando Cartella per salvaschermo fotografico @@ -677,7 +666,6 @@ Interfaccia disabilitata Disabilitazione dell'interfaccia di rete effettuata con successo. Nome della rete wireless (ESSID) - Permetti ai programmi installati di controllare XBMC Porta Range porte @@ -686,17 +674,14 @@ Ritardo ripetizione continuo (ms) Numero massimo di clients Accesso a Internet - Inserito un numero di porta non valido Il numero di porta deve essere compreso tra 1-65535 Il numero di porta deve essere compreso tra 1024-65535 - - Anteprima salvaschermo + - Anteprima Impossibile connettersi XBMC non è riuscito a connettersi all'indirizzo di rete. La possibile causa potrebbe essere la rete scollegata. Vuoi aggiungerlo comunque? - Indirizzo IP Aggiungi indirizzo di rete Protocollo @@ -728,30 +713,27 @@ Sottomenu Attiva pulsanti sottomenu Preferiti - Plugin video - Plugin musica - Plugin immagini + Addon Video + Addon Musica + Addon Immagini Caricamento cartella Trovati %i elementi Trovati %i di %i elementi - Plugins programmi + Addon Programmi Imposta icona plugin - Impostazioni plugin + Impostazioni Addon Access point Altro... - Nome utente Impostazioni script Singoli Inserisci l'indirizzo web - SMB client Workgroup Default username Default password - WINS server Monta condivisioni SMB - Rimuovi Musica Video @@ -776,25 +758,22 @@ Programmi, video e musica Programmi, immagini e musica Programmi, immagini e video - - - - - + + + + + + Autorilevamento Autorilevamento sistema Nick name - Richiedi di connetersi Invia user e password FTP Intervallo ping Vuoi connetterti al sistema rilevato? - Annuncia questi servizi ad altri sistemi via Zeroconf - Dispositipo audio personalizzato Dispositivo passthrough personalizzato - Mutevole e Gelata @@ -820,21 +799,18 @@ Tempeste Piogge Moderate - - - + Molto Alto + Ventoso + Nebbia Metti lo schermo in risparmio energetico quando inattivo - - Durata: - Esecuzione script non riuscita! : %s Necessaria una versione più recente - Controlla il log - - - + + + + Abilita LCD/VFD - Home Programmi Immagini @@ -857,19 +833,15 @@ Impostazioni - Aspetto Script Browser Web - Video/Playlist Impostazioni - Profili - Casella di dialogo si/no Progressione - Cerco i sottotitoli... Ricerca o memorizzazione sottotitoli... terminando buffering Apertura stream - Musica/Playlist Musica/File Musica/Archivio @@ -882,14 +854,11 @@ Gioco online Estensioni Info sistema - Musica - Archivio Musica - In Riproduzione - Video - In Riproduzione Info album Info film - Casella di selezione Musica/Info Dialog OK @@ -897,24 +866,32 @@ Script/Info Video a schermo intero Effetti grafici - Casella di unisci Ricostruzione indice... Ritorna in musica Ritorna in video - - - - - - - - - + + + + + + + + + + + + + + + + + + Parti dall'inizio Riprendi da %s - - + + 0 1 2 @@ -934,7 +911,7 @@ Inserire codice sblocco o premere C per annullare Inserire combinazione tasti gamepad e - premere Ok, oppure Back per annullare + premere OK, oppure Back per annullare Blocca Sblocca Reset blocco @@ -964,33 +941,34 @@ Questo resetterà i valori salvati in precendeza Tempo di visualizzazione di ogni immagine Usa gli effetti pan e zoom - - - + + + + + + Orario in 12 ore Orario in 24 ore Giorno/Mese Mese/Giorno - Tempo di vita del sistema Minuti Ore Giorni Tempo totale d'accensione - Meteo - Salvaschermo OSD a schermo intero - Sistema Autospegnimento hard disk immediato Solo video - Ritardo - Durata minima del file Spegni - - + + + + Funzionalità spegnimento Spegni Iberna @@ -999,16 +977,13 @@ Riavvia Riduci ad icona Comportamento tasto power - C'è un'altra sessione attiva, forse via SSH? Hard disk rimuovibile montato Rimozione insicura Rimozione periferica effettuata Joystick inserito Joystick disinserito - Batteria scarica - Filtro sfarfallio Fai scegliere al driver (riavvio necessario) Vertical blank sync @@ -1018,12 +993,10 @@ Prova e applica risoluzione Salva risoluzione? Vuoi mantenere questa risoluzione? - Ridimensionamento ad alta qualità Disabilitato Attivo per Contenuto SD Sempre attivo - Modalità di ridimensionamento Bicubico Lanczos @@ -1031,48 +1004,57 @@ VDPAU Livello VDPAU HQ Upscaling Livello di conversione colore VDPAU Studio - Svuota gli altri schermi Disabilitato Schermi vuoti - Rilevata connessione attiva! Se continui, potresti non essere in grado di controllare XBMC. Sei sicuro di voler fermare l'Event server? - Modifica modalità Apple Remote? Se stai usando un Apple Remote per controllare XBMC, cambiare quest'impostazione potrebbe impedirti di continuare a controllarlo. Vuoi continuare? - - - - - - - - - - + + + + + + + + + + + + + + + + + + Maschera subnet: Gateway: DNS Primario Inizializzazione fallita - - - - - - - - - + + + + + + + + + + + + + + Mai Immediatamente Dopo %i secondi Data installazione hard disk: Conteggio spegnimenti HDD: - Profili Cancella profilo '%i'? Ultimo profilo caricato: @@ -1083,16 +1065,13 @@ Partito, allarme tra %im Allarme! Annullato con ancora %im%is - Cerca sottotili nei file RAR Mostra sottotili... Sposta l'elemento Sposta l'elemento qui Annulla spostamento - Hardware: Utilizzo CPU: - Connesso, ma non c'è nessun DNS disponibile. Hard Disk DVD-ROM @@ -1101,23 +1080,15 @@ Rete Video Hardware - Sistema operativo: Velocità CPU: - BIOS rilevato: Codificatore video: Risoluzione schermo: - Versione Xbox: - Xbox serial number: - Costruttore Xbox: - Modchip: Cavo A/V: - Video & XBE region: Regione DVD: Internet: Connessa Non connessa. Controlla configurazione rete! - Xbox Live key: Temperatura da raggiungere Velocità ventola Controllo automatico temperatura @@ -1156,8 +1127,6 @@ Edit label Imposta predefinito Rimuovi pulsante - LED frontale - Colore LED frontale Lascia com'è Verde Arancione @@ -1217,7 +1186,6 @@ Top 250 Sintonizzati su Last.FM Minima vel. ventola - Download in corso Includi gli artisti presenti solo nelle compilation Metodo di render @@ -1236,8 +1204,7 @@ Abilita accelerazione hardware (CrystalHD) Abilita accelerazione hardware (VDADecoder) Abilita accelerazione hardware (OpenMax) - Pixel Shaders - + Pixel Shaders Metodo di sincronizzazione A/V Clock audio Clock video (Lascia/Aggiungi audio) @@ -1249,20 +1216,15 @@ Alta Molto alta Sincronizza il suono all'immagine - Telecomando Apple - Permetti avvio di XBMC da telecomando Ritardo nella sequenza - Disabilitato Standard Telecomando Universale Telecomando Multi (Harmony) - Errore Apple Remote Il supporto per Apple Remote non è stato attivato. - Unisci volumi Dividi volumi Scaricamento file playlist... @@ -1270,7 +1232,6 @@ Esamino lista streams... Scaricamento lista streams fallito Scaricamento file playlist fallito - Cartella giochi Attivazione vista ad icone per Auto-attivazione vista ad icone @@ -1297,12 +1258,11 @@ cache DVD - DVD-ROM - Rete Locale Servizi - Impostazioni di rete cambiate XBMC deve essere riavviato per cambiare le tue impostazioni di rete. Vuoi riavviare adesso? - - + + - Spegnimento durante l'esecuzione %i min %i sec @@ -1314,7 +1274,6 @@ Formato orario Formato data Filtri interfaccia - Usa scansione in background Ferma scansione Non si può durante la scansione informazioni media @@ -1332,7 +1291,6 @@ Vuoi salvare queste impostazioni adesso? Salva impostazioni Consenti la rinominazione e la cancellazione dei file - Imposta il fuso orario Passa all'ora legale Aggiungi ai preferiti @@ -1354,28 +1312,22 @@ Debugging Sicurezza Dispositivi di input - Risparmio energetico - + Risparmio energetico Rimuovi Giochi - Aggiungi - Password - Archivio Banca dati * Tutti gli album * Tutti gli artisti * Tutte le canzoni * Tutti i generi - Caricando... Suoni di navigazione Default della skin - Tema Tema di default - Last.fm Invia le canzoni a Last.fm Nome utente Last.fm @@ -1398,7 +1350,6 @@ Password di Libre.fm Libre.fm Invio canzone - Invia la radio Last.fm a Last.fm Connessione a Last.fm... Selezione stazione... @@ -1448,21 +1399,16 @@ Riammetti Vuoi rimuovere questa traccia dalle tracce preferite? Vuoi togliere il divieto a questa traccia? - Percorso non trovato o invalido Non è stato possibile connettersi al server Nessun server trovato Nessun workgroup trovato - Apertura sorgente multipercorso Percorso: - Generale - Ricerca Internet Lettore Riproduci i media dal disco - Inserire nuovo titolo Inserire nome del film Inserire nome del profilo @@ -1491,19 +1437,12 @@ Impossibile aprire il database. Impossibile ricavare canzoni dal database. Party mode playlist - Tutti i video Non visti Già visti Segna come già visto Segna come non visto Modifica titolo - Usa NTSC-M & NTSC-J - Usa solo NTSC-M - Usa solo NTSC-J - Usa solo PAL-60 - Per giochi a 60Hz - L'operazione è stata annullata Copia non riuscita Almeno un file non è stato copiato @@ -1511,7 +1450,6 @@ Almeno un file non è stato spostato Cancellazione non riuscita Almeno un file non è stato cancellato - Metodo di ridimensionamento Più vicino Bilineare @@ -1522,8 +1460,8 @@ Bicubico (software) Lanczos (software) Sinc (software) - (VDPAU)Temporale - (VDPAU)Temporale/Spaziale + Temporale + Temporale/Spaziale (VDPAU)Riduzione Rumore Nitidezza Telecine Inverso @@ -1532,27 +1470,21 @@ Temporale (mezzo) Temporale/Spaziale (mezzo) DXVA - Video post-processing Disattivato Attivato per contenuto SD Sempre Attivato - Tempo di spegnimento display - Cambia al canale - Cartella per il salvataggio della musica Usa un player DVD esterno Player DVD esterno Cartella dei trainer Cartella per gli screenshot - Cartella playlists Registrazioni Screenshots Usa XBMC - Playlists musica Playlists video Vuoi lanciare il gioco? @@ -1562,21 +1494,17 @@ Icona locale Nessuna icona Seleziona icona - - - + + Conflitto Scansiona nuovo Scansiona tutto Regione - - - Sommario Blocca sezione musica Blocca sezione video Blocca sezione immagini - Blocca sezione programmi salvataggi e scripts + Blocca sezione programmi e script Blocca filemanager Blocca impostazioni Nuova partenza @@ -1591,7 +1519,6 @@ Uscito da master mode Entrato in master mode Icona Allmusic.com - Rimuovi icona Aggiungi profilo... Cerca info per tutti gli album @@ -1721,22 +1648,17 @@ Ruota le immagini usando le informazioni EXIF Usa la vista a poster per le serie TV Attendere Prego - Lettura valori della EEPROM - Lettura valori del BIOS Attiva lo scorrimento automatico per la trama e la recensione Custom Attiva il debug logging Scarica ulteriori informazioni durante gli aggiornamenti Scraper per le informazioni sugli album - Scraper per le informazioni sugli artisti + Scraper predefinito per gli artisti Cambia scraper Esporta archivio musicale Importa archivio musicale Nessun artista trovato! Scaricamento info artista fallito - - - Party attivo! (videos) Mixando bevande (videos) Riempiendo bicchieri (videos) @@ -1745,37 +1667,36 @@ Primo login, edita il tuo profilo HTS Tvheadend client VDR Streamdev client - Web server directory (HTTP) Web server directory (HTTPS) Impossibile scrivere nella cartella: Vuoi ignorare e procedere? RSS Feed - - + + DNS secondario DHCP server: Crea nuova cartella Oscura LCD se in riproduzione Sconosciuto o installato (protetto) Oscura LCD se in pausa - + + Video - Archivio - Salvataggi giochi Ordina per: ID - Scarica salvataggi - Salvataggio installato Su HDD - Download del salvataggio fallito - - - - + + + + + + + + Play part... Reset calibrazione Questo resetterà il valore di calibrazione per %s al suo valore originale. Cerca la destinazione - Usa i nomi delle cartelle per le ricerche File Uso i nomi dei files o delle cartelle per le ricerche? @@ -1822,7 +1743,7 @@ Stagione Scaricamento informazioni film Contenuto non assegnato - + Titolo originale Aggiorna informazioni serie TV Aggiorna info per tutti gli episodi? La cartella contiene una sola serie TV @@ -1850,7 +1771,6 @@ Riproduci video musicale Scarica le icone degli attori all'aggiunta in archivio Imposta icona attore - Rimuovi segnalibro episodio Imposta segnalibro episodio Impostazioni scraper @@ -1865,7 +1785,6 @@ Prima visione Scrittore Pulisci i nomi dei files e delle cartelle - Mai Se solo una stagione Sempre @@ -1882,7 +1801,7 @@ Estrai le immagini e le informazioni video Set Imposta icona movieset - Esporta l'icona dell'attore + Esporta immagini attori? Seleziona fanart Fanart locale Nessuna fanart @@ -1900,10 +1819,7 @@ Paesi episodio episodi - - Mostra i files e le cartelle nascoste - TuxBox client ATTENZIONE: il dispositivo TuxBox è in modalità registrazione! Lo stream verrà fermato! @@ -1911,16 +1827,12 @@ Sicuro di fare partire lo stream ? Connessione a: %s Dispositivo TuxBox - - Aggiungi condivisione media... Condividi gli archivi musicali e video attraverso UPnP - Modifica condivisioni media Rimuovi condivisioni media Cartella sottotitoli Film & cartella sottotitoli alternativa - Abilita il mouse Suoni di navigazione attivi durante la riproduzione Icone @@ -1987,7 +1899,7 @@ Modifica smart playlist Nome della playlist Trova gli elementi che combaciano - - Modifica + Modifica %i elementi Nuova smart playlist... %c Drive @@ -2006,7 +1918,6 @@ Richiesta connessione Internet. Altro... Root filesystem - Nome file Percorso file Dimensione file @@ -2016,7 +1927,6 @@ Commento Colori/bn Processo JPEG - Data/Ora Descrizione Marca fotocamera @@ -2041,7 +1951,6 @@ Longitudine GPS Altitudine GPS Orientamento - Categorie supplementari Parole chiave Titolo @@ -2083,13 +1992,9 @@ Anni attività Etichetta Nato/Formato - - - Aggiorna l'archivio all'avvio - Aggiorna l'archivio sempre in background + Nascondi avanzamento aggiornamento archivio - Suffisso DNS - In ritardo di: %2.3fs In anticipo di: %2.3fs Offset sottotitoli @@ -2111,8 +2016,6 @@ Mostra i file video nelle liste DirectX Vendor: Versione Direct3D: - - Carattere - Dimensione - Colore @@ -2127,32 +2030,24 @@ bianco/rosso bianco/blu nero/bianco - Azione predefinita di selezione Scegli Mostra Informazioni Altro... Riproduci tutto - Teletext non disponibile Attiva il Teletext - Parte %i + Parte %i Buffering %i bytes In arresto In esecuzione - - Player Esterno Attivato Premi OK per chiudere il player - Premi OK al termine della riproduzione - - Add-on Add-ons Opzioni Add-on Informazioni Add-on - Plugin Scraper Film Salvaschermo @@ -2165,7 +2060,6 @@ Scraper Videoclip Scraper Album Scraper Artista - Configura Disabilita Abilita @@ -2186,7 +2080,6 @@ Installa da un file zip Scaricando %i%% Aggiornamenti Disponibili - Add-ons disponibili Versione: Informazioni @@ -2203,7 +2096,6 @@ Download dell'Add-ons in corso Aggiornamento disponibile Aggiorna - L' Add-on non può essere caricato Si è verificato un errore sconosciuto. Impostazioni richieste @@ -2212,30 +2104,26 @@ Disabilita Provo a riconnettere? Riavvio dell'Add-on - Blocca il manager degli Add-on - - - - - - - + + + + + + + + + + Questo Add-on è segnalato non funzionante nel repository. Vuoi disabilitarlo nel tuo sistema? Non funzionante - - Modo Archivio Tastiera QWERTY Periferica Audio passthrough utilizzata - - - - - - - + + + Durata della ricerca Qualità trailer Stream Scarica @@ -2246,7 +2134,6 @@ Salvataggio Copia Imposta directory download - Durata della ricerca Breve Lungo Usa DVD player invece del player normale @@ -2303,11 +2190,10 @@ Aggiorna XBMC. Nessun informazione trovata! Prossima pagina - Amore - Odio - Questo file è multiplo, seleziona la parte da cui iniziare la riproduzione. - Percorso per lo script - Abilita il pulsante per lo script personalizzato - + Amore + Odio + Questo file è multiplo, seleziona la parte da cui iniziare la riproduzione. + Percorso per lo script + Abilita il pulsante per lo script personalizzato Configurazione casse diff -Nru xbmc-10.00~svn33778/language/Japanese/strings.xml xbmc-10.00~svn34731/language/Japanese/strings.xml --- xbmc-10.00~svn33778/language/Japanese/strings.xml 2010-09-02 08:07:27.000000000 +0000 +++ xbmc-10.00~svn34731/language/Japanese/strings.xml 2010-09-19 12:40:15.000000000 +0000 @@ -2,8 +2,8 @@ - - + + プログラムピクチャ @@ -239,7 +239,7 @@ アルバムを更新できません変更を書き込み中... 書き込みができません - しばらくお待ち下さい... + お待ち下さい... データベースの圧縮中... データベースを圧縮できませんライブラリを消去しますか？ @@ -355,7 +355,7 @@ 4行目のアドレス行数モード - スイッチビュー + ビュー切り替えサブ音声 [アクティブ] @@ -400,7 +400,7 @@ ファイルからメディア情報を読み込んでいます... ソート: 回数視覚エフェクトを有効 - ビデオモードを変更 + ビデオモードを切り替えを有効起動画面メニュー画面手動設定 @@ -411,7 +411,7 @@ XBEタイトル編集コンピレーションこのソースを削除 - Switch Media + メディア切り替えプレイリスト選択新規プレイリスト... プレイリストに追加 @@ -424,7 +424,7 @@ Enter Genre View: %s List - Icons + アイコン Big List Big Icons Wide @@ -440,11 +440,11 @@ Name Date Size - Track + トラック Time Title アーティスト - Album + アルバム Playlist ID File @@ -734,7 +734,7 @@ スクリプト Webブラウザビデオ/プレイリスト - 設定 - プロフィール + 設定 - プロファイルはい/いいえダイアログ進行ダイアログ字幕を検索しています... @@ -824,8 +824,8 @@ ﾊﾟｽﾜｰﾄﾞが未記入です再び試みてくださいﾏｽﾀｰﾛｯｸ Shutdown system if Master Lock retries exceeded - ﾏｽﾀｰｺｰﾄﾞが有効ではありません! - 正しいﾏｽﾀｰｺｰﾄﾞを入力して下さい! + ﾏｽﾀｰｺｰﾄﾞが有効ではありません + 正しいﾏｽﾀｰｺｰﾄﾞを入力して下さい Settings & Filemanager Set as default for all Movies This will reset any previously saved values @@ -900,7 +900,7 @@ After %i secs HDD Install Date: HDD Power Cycle Count: - プロフィール + プロファイルﾌﾟﾛﾌｨｰﾙ '%s'を削除しますか？最後にﾛｰﾄﾞしたﾌﾟﾛﾌｨｰﾙ: 不明 @@ -1029,7 +1029,7 @@ Show track position Clear Default Resume - サムネイル取得 + サムネイルを取得画像情報 %s Presets (IMDb User Rating) @@ -1142,7 +1142,7 @@ キャッシュ済み曲 %i 送信中... 送信 %i 秒 - Play Using... + ...を使用して再生 Use Smoothed A/V Synchronisation Hide File Names in Thumbs View Play in Party Mode @@ -1258,14 +1258,14 @@ Recordings Screenshots Use XBMC - Music Playlists - Video Playlists + ミュージックプレイリスト + ビデオプレイリスト Do you wish to launch the game? Sort by: Playlist - Remote Thumb - Current Thumb - Local Thumb - No Thumb + サーバ上のサムネイル + 現在のサムネイル + ローカルサムネイル + サムネイルなしサムネイルを選択 @@ -1416,8 +1416,9 @@ Backspace Space スキンを再ロード + EXIF情報による画像の向き補正 Use Poster View Styles for TV Shows - Please Wait + お待ち下さい... Backing up EEPROM Backing up BIOS Enable Auto Scrolling for Plot & Review @@ -1479,7 +1480,7 @@ votes TV番組情報エピソード情報 - Loading TV Show details + TV番組の詳細をロード中 Fetching Episode Guide Loading Info For Episodes In Directory Select TV Show: @@ -1487,7 +1488,7 @@ Season %i Episode Episodes - Loading Episode details + エピソードの詳細をロード中エピソードをライブラリから削除 TV番組をライブラリから削除 TV Show @@ -1733,8 +1734,7 @@ さらに... 現在ダウンロード中のAdd-on Library Mode - QWERTY Keyboard + QWERTYキーボードパススルーオーディオ使用中 - Apply Flicker Filter Setting to Games メニュー - + \ No newline at end of file diff -Nru xbmc-10.00~svn33778/language/Korean/strings.xml xbmc-10.00~svn34731/language/Korean/strings.xml --- xbmc-10.00~svn33778/language/Korean/strings.xml 2010-09-13 07:48:57.000000000 +0000 +++ xbmc-10.00~svn34731/language/Korean/strings.xml 2010-10-11 19:23:56.000000000 +0000 @@ -2,8 +2,8 @@ - - + + 프로그램 사진 @@ -84,6 +84,8 @@ 미리보기 만들기 바로가기 일시중지 + 업데이트 실패함 + 설치 실패함 복사 이동 삭제 @@ -335,9 +337,9 @@ 이른 소나기 눈보라 - 최저 + 낮음 보통 - 최고 + 높음 안개 흐린 안개 지역 선택 @@ -360,8 +362,8 @@ 미리보기 다운로드중... 사용할수 없음 보기: 큰 아이콘 - 낮은 - 높은 + 최저 + 최고 HDMI 앨범 정보 삭제 CD 정보 삭제 @@ -532,6 +534,8 @@ CDDA 추출 경로가 설정되지 않음. 오디오 트랙 추출 번호 입력 + 비트/샘플 + 샘플 주파수 오디오 CD 인코더 음질 @@ -766,7 +770,7 @@ 국지적인 얼음 눈 - 온화함 + 고요함 동반한 바람 이슬비 @@ -921,6 +925,7 @@ 재시작 최소화 전원 버튼 동작 + 시스템 전원 끄기 혹시 ssh 를 통해 다른 세션이 활성화되어 있습니까? 장착된 이동식 하드드라이브 장치 제거 안전하지 않음 @@ -1132,6 +1137,10 @@ 높음 매우 높음(느림!) 화면에 재생 동기 + 새로고침 비율 변경시 일시중지 + 끄기 + %.1f 초 + %.1f 초 애플 리모트 리모트를 사용하여 XBMC 시작 허용 순차 지연 시간 @@ -1576,6 +1585,7 @@ 처음 로그인, 프로파일을 수정하세요 HTS Tvheadend 클라이언트 VDR Streamdev 클라이언트 + MythTV 클라이언트 웹 서버 디렉토리 (HTTP) 웹 서버 디렉토리 (HTTPS) 폴더에 쓸수 없음: @@ -2009,7 +2019,6 @@ 라이브러리 모드 쿼티 키보드 패스스루 오디오 사용중 - 재생시간 찾기 예고편 품질 스트림 다운로드 @@ -2020,6 +2029,7 @@ 저장 복사 다운로드 디렉토리 설정 + 검색 기간 짧은 긴 일반 플레이어 대신 DVD 플레이어 사용 diff -Nru xbmc-10.00~svn33778/language/Norwegian/strings.xml xbmc-10.00~svn34731/language/Norwegian/strings.xml --- xbmc-10.00~svn33778/language/Norwegian/strings.xml 2010-07-21 15:21:49.000000000 +0000 +++ xbmc-10.00~svn34731/language/Norwegian/strings.xml 2010-10-06 10:08:32.000000000 +0000 @@ -1,9 +1,7 @@ - - - - - - + + + Programmer Bilder @@ -15,6 +13,7 @@ Filbehandler Vær xbmc media center + Mandag Tirsdag Onsdag @@ -22,6 +21,7 @@ Fredag Lørdag Søndag + januar februar mars @@ -34,6 +34,7 @@ oktober november desember + Man Tir Ons @@ -42,6 +43,7 @@ Lør Søn Jan + Feb Mar Apr @@ -53,6 +55,25 @@ Okt Nov Des + + N + NNØ + NØ + ØNØ + Ø + ØSØ + SØ + SSØ + S + SSV + SV + VSV + V + VNV + NV + NNV + VAR + Visning: Auto Visning: Auto stor Visning: Ikoner @@ -68,6 +89,8 @@ Lag miniatyrbilder Snarveier Pause + Oppdatering feilet + Installering feilet Kopier Flytt Slett @@ -120,17 +143,18 @@ Ingen disk Disk tilstede Skinn - Aktiver FTP server - - + + Oppløsning Sett oppdateringsfrekvens til å samsvare med video - - + + Utgitt Vis 4:3-videoer som + Stemninger Stiler + Sang Lengde Velg album @@ -151,8 +175,10 @@ Velg film: Spør etter %s informasjon Laster filmdetaljer + Webgrensesnitt Slagord Handling + Stemmer: Skuesp. Plott @@ -170,8 +196,9 @@ Ingen nettverkstilkobling Avbryt Hastighet - Testbilder - Finn CD-informasjon på internett + + Testbilder... + Hent CD-informasjon fra freedb.org Bland spillelisten ved lasting Tid før harddisk spinner ned (min) Videofiltre @@ -185,9 +212,12 @@ Forstørring Tøm spilleliste når ferdigspilt Visningsmodus - Full skjerm + Fullskjerm #%d Vindu Oppdateringsfrekvens + Fullskjerm + Skalering: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Piksler: %2.2f:1) + Skript Språk Musikk @@ -226,7 +256,7 @@ Fant %i treff Søkeresultater Ingen resultater funnet - Etterbehandlingsfilter + Undertekster Skrifttype - Størrelse @@ -246,11 +276,11 @@ Språk Aktivert Ikke-innfelt - - Automatisk etterprosessering - - Vertikalt deblocking-filter - - Horisontalt deblocking-filter - - Automatisk lysstyrke/kontrast - - Ringartefakt filter + + + + + (0=automatisk) Renser database Forbereder... @@ -278,7 +308,7 @@ Konverter bildefrekvens Lydutgang Analog - Digital + Optisk/koaks Diverse artister Spill plate Filmer @@ -343,8 +373,8 @@ Vind Duggpunkt Fuktighet - Fra - på + + Standard Kobler til værtjeneste Henter værdata for: @@ -357,6 +387,7 @@ Lav Høy HDMI + Slett albuminformasjon Slett CD-informasjon Velg @@ -369,6 +400,8 @@ Ingen mellomlagring Slett film fra bibliotek Er du sikker på at du vil slette '%s'? + Fra %s, %i %s + Flyttbare medier Åpner filen Mellomlagring @@ -412,6 +445,7 @@ Utseende Lydinnstillinger Om XBMC + Slett album Gjenta Gjenta én @@ -439,10 +473,11 @@ Hovedmeny Manuelle innstillinger Sjanger + Nylig spilte album Start Start som.. - Rediger XBE-tittel + Samlinger Fjern kilde Bytt media @@ -471,6 +506,7 @@ Passthrough lydenhet Ingen biografi for denne artist Miks multikanals audio til stereo + Sort.: %s Navn Dato @@ -491,11 +527,13 @@ Antall avspillinger Sist avspilt Kommentar - Dato opprettet + Dato lagt til Standard Studio Sti Land + Pågår + Sorteringsretning Sorteringsmetode Visningsmodus @@ -514,17 +552,20 @@ Gjenta: Av Gjenta: En Gjenta: Alle + Ripp musikk-CD Middels Standard Ekstrem Konstant bitrate Ripper fra CD... + Til: Kunne ikke rippe CD eller spor CDDA-sti for ripping er ikke satt Ripp musikkspor Skriv inn nummer + CD-ripping Koder Kvalitet @@ -562,25 +603,30 @@ Bla etter mappe Sanginformasjon Ikke-lineær strekking + Lydforsterkning Velg eksportmappe Denne filen er ikke lenger tilgjengelig. Vil du fjerne den fra biblioteket? Let etter script Kompresjonsnivå + Renser bibliotek Fjerner gamle sanger fra biblioteket Denne katalogen har blitt skannet før. Nettverk - Server + Bruk HTTP proxy for å få tilgang til Internett + Internettprotokoll (IP) Ugyldig port spesifisert. Verdien må være mellom 1 og 65535. HTTP proxy + - Tilordning Automatisk (DHCP) Manuell (statisk) - Standard (dashbord) + - IP adresse - Nettmaske - Standard gateway @@ -591,13 +637,11 @@ Forandringer er ikke lagret. Vil du fortsette uten å lagre? Webserver FTP-server - - - Webserverport - - + + - Port + Lagre & bruke - Webserverpassord + - Passord Intet passord - Tegnsett - Stil @@ -616,10 +660,12 @@ Speil bilde Er du sikker? Fjern kilde + Legg til programlenke Rediger programsti Rediger programnavn Rediger stidybden + Vis: Stor liste Gul Hvit @@ -629,8 +675,10 @@ Blå/grønn Lys grå Grå + + Feil %i: delt mappe ikke tilgjengelig - - Automatisk FATX begrensning + Lydmaskinvare Søker Mappe for bildefremvisning @@ -649,6 +697,7 @@ Enheten deaktivert. Nettverksenheten deaktivert uten feil. Trådløst nettverknavn (ESSID) + Tillat programmer på dette systemet å styre XBMC Port Portområde @@ -657,14 +706,17 @@ Forsinkelse for kontinuerlig repetisjon (ms) Maksimalt antall klienter Internettilgang + Ugyldig portnummer Gyldig område er 1-65535 Gyldig område er 1024-65535 - Forhåndsvisning av skjermbeskytter + + Forhåndsvisning Kan ikke koble til XBMC kunne ikke koble til nettverksplasseringen. Dette kan være fordi nettverket ikke er tilkoblet. Ønsker du å legge den til likevel? + IP-adresse Legg til nettverksplassering Protokoll @@ -696,27 +748,30 @@ Undermeny Aktiver undermenyknapper Favoritter - Video-plugin - Musikk-plugin - Bilde-plugin + Videotillegg + Musikktillegg + Bildetillegg Laster katalog Gjenopprettet %i deler Gjenopprettet %i av %i deler - Program-plugin - Velg miniatyrbilde for plugin - Plugin-innstillinger + Programtillegg + Velg miniatyrbilde for tillegg + Innstillinger for tillegg Aksesspunkt Andre.. - Brukernavn Skript-innstillinger Singler Skriv inn webadresse + SMB-klient Arbeidsgruppe Standard brukernavn Standard passord + WINS-server Monter delte SMB-mapper + Fjern Musikk Video @@ -741,19 +796,25 @@ Programmer & video & musikk Programmer & bilder & musikk Programmer & bilder & video - FTP brukernavn - FTP passord - Brukerpassord ble endret + + + + + Autooppdagelse Autooppdag system Kallenavn + Spør om det skal kobles til Send FTP brukernavn og passord Ping-intervall Ønsker du å koble til det oppdagede systemet? + Zeroconf publisering + Egendefinert lydenhet Egendefinert passthrough-enhet + forbigående og kjølig @@ -762,10 +823,9 @@ tordenbyger torden sol - tunge + mye i - - + nærheten is krystaller @@ -779,12 +839,28 @@ kornete tordenvær tordenvær - Moderat + moderat + mye + vind + disig + + + Slukk skjerm når ikke i bruk + + Spilletid + Skript mislyktes! : %s - Nyere versjon trengs - Se logg + Nyere versjon trengs - se logg + + + + + + Aktiver LCD/VFD + Forside Programmer Bilder @@ -806,16 +882,22 @@ Innstillinger - Nettverk Innstillinger - Utseende Skript - Internettleser - Filmer/Spilleliste + Nettleser + + Videoer/Spilleliste + Innstillinger - Profiler + Ja/Nei dialog - Progresjonsdialog + Forløpsdialgboks + + Leter etter undertekster... Leter etter eller henter undertekster... avslutter mellomlagrer Åpner datastrøm + Musikk/Spilleliste Musikk/Filer Musikk/Bibliotek @@ -828,11 +910,14 @@ Spilling over nettverk Tillegg Systeminformasjon + Musikk - bibliotek Spilles nå - Musikk + Spilles nå - Videoer Albuminformasjon Informasjon om film + Velg dialog Musikk/Info Dialog OK @@ -840,22 +925,24 @@ Skript/Info Fullskjermsvideo Lydvisualisering + Filstablingsdialog Gjenoppbygg indeks... Returner til musikk Returner til videoer - Oppdater trainer-liste - Trainer - Ingen trainere funnet - Trainer-innstillinger - Alle registrerte trainere mangler. Oppdater din liste - Gjenoppta avspilling - Nei - Ja - Spør + + + + + + + + + Start fra begynnelsen Fortsett fra %s - Validerer eksisterende trainere... + + 0 1 2 @@ -875,7 +962,7 @@ Skriv inn kode eller trykk C for å avbryte Skriv inn knappekombinasjon og trykk start - trykk Start, eller Back for å avbryte + trykk Ok, eller Tilbake for å avbryte Lås Lås opp Nullstill lås @@ -905,29 +992,33 @@ Dette vil slette alle tidligere innstillinger Vis hvert bilde i Bruk effekter med panorering og zooming - Spill NTSC-videoer som PAL - Spill PAL-videoer som NTSC - Spill NTSC-videoer som PAL60 + + + 12-timers klokke 24-timers klokke Dag/måned Måned/dag + Systemets oppetid Minutter Timer Dager Total oppetid + Været + Skjermbeskytter Fullskjerm OSD + System Spinn ned harddisk umiddelbart Kun video - Forsinkelse - Minimum filvarighet Slå av - Instrumentbord - Bruk egendefinert sti til instrumentbord + + Standardinnstilling for avslutning Avslutt Dvalemodus @@ -936,13 +1027,16 @@ Omstart Minimer Hendelse ved trykk på av/på-knapp + Er en annen sesjon aktiv, eventuelt over ssh? Montert utskiftbar harddisk Usikker fjerning av enhet Enhet ble fjernet Joystick ble plugget inn Joystick ble plugget ut + Batterinivå lavt + Flimmerfilter La skjermdriver velge (krever omstart) Vertical blank sync @@ -952,10 +1046,12 @@ Test oppløsning Lagre oppløsning? Vil du beholde denne oppløsningen? + Programvareoppskalering Deaktivert Aktivert for SD materiale Alltid aktivert + Oppskaleringsmetode Bikubisk Lanczos @@ -963,41 +1059,47 @@ VDPAU- VDPAU HQ oppskaleringsnivå VDPAU studionivå fargekonvertering + Blank andre skjermer Deaktivert Blank skjermer + Aktive tilkoblinger oppdaget! Om du fortsetter kan det hende du ikke greier kontrollere XBMC lengre. Er du sikker på du vil stoppe hendelseserveren? + Endre Apple fjernkontrollmodus? Om du nå bruker Apple fjernkontroll for å styre XBMC, kan denne innstillingen påvirke muligheten for fortsatt gjøre det. Vil du fortsette? - HDD nøkkel: - HDD temperatur: - DVD modell: - DVD fastvare: - HDD modell: - HDD serienummer: - HDD fastvare: - HDD passord: - HDD låsstatus: + + + + + + + + + + Nettverksmaske: Gateway: Primær DNS Initialisering mislyktes - Kontrollere - Tastatur - Mus på port: - Hodetelefoner/Mikrofon - Minnepinne - Fjernkontroll - Kontrollerport + + + + + + + + Aldri Umiddelbart Etter %i sek Harddisk installert dato: Harddisk antall oppstarter: + Profiler Vil du slette profilen '%s'? Sist lastede profil: @@ -1008,13 +1110,18 @@ Startet, alarm om %im Alarm! Avbrutt med %im%er igjen + %2.0fm + %2.0fs + Søk etter undertekster i RAR filer Bla etter undertekst... Flytt oppføring Flytt hit Avbryt flytting + Maskinvare: Prosessorbruk: + Tilkoblet, men ingen DNS er tilgjengelig. Harddisk DVD spiller @@ -1023,22 +1130,23 @@ Nettverk Skjermkort Maskinvare + Operativsystem: Prosessorhastighet: - Oppdaget BIOS: + Videobrikke: Skjermoppløsning: - Xbox versjon: - Xbox serienummer: - Xbox produsent: - ModChip: + + + + A/V kabel: - Video & XBE region: + DVD region: Internett: Tilkoblet Ikke tilkoblet. Sjekk nettverksinnstillinger. - Xbox Live nøkkel: + Temperaturmål Viftehastighet Automatisk temperaturkontroll @@ -1077,8 +1185,8 @@ Rediger knapp Gjør til standard Fjern knapp - Front LED - Front LED farge + + Standard Grønn Oransje @@ -1138,6 +1246,7 @@ Topp 250 Still inn på Last.FM Minimum viftehastighet + Laster ned Inkluder artister som bare opptrer i samlinger Rendringsmetode @@ -1151,12 +1260,14 @@ Husk for denne katalogen Bruk 'Pixel buffer objects' Broadcom Crystal HD - Tillat hardware aksellerasjon (VAAPI) - Tillat hardware aksellerasjon (DXVA2) - Tillat hardware aksellerasjon (CrystalHD) - Tillat hardware aksellerasjon (VDADecoder) - Tillat hardware aksellerasjon (OpenMax) - Pixel Shaders + Tillat maskinvareakselerasjon (VAAPI) + Tillat maskinvareakselerasjon (DXVA2) + Tillat maskinvareakselerasjon (CrystalHD) + Tillat maskinvareakselerasjon (VDADecoder) + Tillat maskinvareakselerasjon (OpenMax) + Piksel shader + + A/V synkmetode Lydklokking Videoklokking (dropp/dupliser lyd) @@ -1168,15 +1279,19 @@ Høy Veldig høy (sakte) Synkroniser avspilling til skjerm + Apple fjernkontroll - Alltid på + Tillat oppstart av XBMC fra fjernkontrollen Sekvensforsinkelse + Deaktivert Standard Universal fjernkontroll Multifjernkontroll (Harmony) + Feil med Apple fjernkontroll Apple fjernkontroll kan aktiveres + Stable Avstable Laster ned spilleliste... @@ -1184,6 +1299,7 @@ Analyserer liste av strømmer... Kunne ikke laste ned liste av strømmer Kunne ikke laste ned spilleliste + Spill mappe Bytt automatisk til miniatyrbilder ved Aktiver automatisk bytte til miniatyrvisning @@ -1210,10 +1326,12 @@ DVD-mellomlager - DVD-spiller - Lokalt nettverk Tjenester + Nettverksinnstillingene er forandret XBMC må starte på nytt for å forandre nettverksinnstillingene. Vil du starte på nytt nå? - Etterprosessering + + - Skru av maskin under spilling %i min %i sek @@ -1225,6 +1343,7 @@ Tidsformat Datoformat GUI-filtre + Bruk bakgrunnsskanning Stopp skanning Ikke mulig når det skannes etter mediainformasjon @@ -1242,6 +1361,7 @@ Bruk disse innstillingene nå? Lagre innstillinger nå Tillat endring av filnavn og sletting + Sett tidssone Bruk sommertid Legg til favoritter @@ -1250,7 +1370,7 @@ Tidssone land Tidssone Fillister - Vis EXIF bilde informasjon + Vis EXIF-bildeinformasjon Bruk ett fullskjermsvindu istedenfor sann fullskjerm Kø sanger ved valg Spill audio CD-er automatisk @@ -1258,27 +1378,33 @@ DVD-er Spill DVD-er automatisk Skrifttype for undertekster - Internasjonal + Språk og lokalisering Tegnsett Debugging Sikkerhet Inn-enheter Strømsparing + Fjern Spill + Legg til + Passord + Bibliotek Database * Alle album * Alle artister * Alle sanger * Alle sjangre + Mellomlagrer... Navigasjonslyder Standard for skinnet - Tema Standardtema + Last.fm Send sanger til Last.fm Last.fm brukernavn @@ -1301,6 +1427,7 @@ Libre.fm passord Libre.fm Scrobbler + Send inn Last.fm-radio til Last.fm Kobler til Last.fm... Velger stasjon... @@ -1350,16 +1477,21 @@ Opphev sperre. Ønsker du å fjerne denne sangen fra dine favoritter? Ønsker du å oppheve sperringen av denne sangen? + Sti ble ikke funnet eller er ugyldig Kunne ikke koble til nettverksserver Ingen servere funnet Arbeidsgruppe ikke funnet + Åpner kilde med flere stier Sti: + Generelt + Internettoppslag Spiller Spill media fra plate + Skriv inn ny tittel Skriv inn filmens navn Skriv inn profilnavnet @@ -1388,17 +1520,19 @@ Kunne ikke åpne databasen. Kunne ikke hente sanger fra databasen. Partymode spilleliste + Alle filmer Usette Sette Merk som sett Merk som usett Rediger tittel - Bruk NTSC-M & NTSC-J - Bruk kun NTSC-M - Bruk kun NTSC-J - Bruk kun PAL-60 - For 60Hz spill + + + + + + Handlingen ble avbrutt Kopiering mislykket Kunne ikke kopiere en eller flere av filene @@ -1406,6 +1540,7 @@ Kunne ikke flytte en eller flere av filene Sletting mislykket Kunne ikke slette en eller flere av filene + Videoskaleringsmetode Nærmeste nabo Bilineær @@ -1426,21 +1561,27 @@ Temporær (halv) Temporær/romlig (halv) DXVA - Video post-prosessering + + Post-prosessering av video Deaktivert - Aktivert for SD innhold + Aktivert for SD-innhold Alltid aktivert + Slå av skjerm etter + Bytt til kanal + Mappe for lagret musikk Bruk ekstern DVD-spiller Ekstern DVD-spiller Mappe for trainere Mappe for skjermbilder + Mappe for spillelister Opptak Skjermbilder Bruk XBMC + Musikkspillelister Filmspillelister Ønsker du å starte spillet? @@ -1450,12 +1591,16 @@ Lokal miniatyr Ingen miniatyr Velg miniatyr - - + + + Konflikt Skann nye Skann alle Region + + + Sammendrag Lås musikksekjson Lås filmseksjon @@ -1475,6 +1620,7 @@ Forlot mastermodus Gikk i mastermodus Allmusic.com miniatyr + Fjern miniatyrbilde Legg til profil... Spør etter info for alle album @@ -1492,7 +1638,7 @@ Start med nye mediakilder Sørg for at den valgte mappen er skrivbar og at det nye mappenavnet er gyldig - Aldersgrense (MPAA) + Aldersgrense Skriv inn masterlåskode Spør etter masterlåskode ved oppstart Skinn-innstillinger @@ -1604,52 +1750,61 @@ Roter bilde i henhold til EXIF-informasjon Bruk plakatvisninger for TV-serier Vennligst vent - Tar backup av EEPROM - Tar backup av BIOS + + Aktiver autorulling for plott og anmeldelse Egendefinert Aktiver feilsøkingslogging Last ned ekstra informasjon under oppdateringer - Standard service for albuminformasjon - Standardtjener for musikkinformasjon + Standardtjener for albuminformasjon + Standardtjener for artistinformasjon Bytt skraper Eksporter musikkbibliotek Importer musikkbibliotek Ingen artist funnet! Nedlasting av artistinfo mislyktes + + + Party on! (filmer) Mikser drinker (filmer) Fyller glassene (filmer) WebDAV-server (HTTP) WebDAV-server (HTTPS) + Første pålogging, editer profilen din + HTS Tvheadend-klient + VDR Streamdev-klient + Webserverkatalog (HTTP) Webserverkatalog (HTTPS) Kunne ikke skrive til mappe: Vil du ignorere problemet og fortsette? RSS-strøm - Ukjent. Vennligst legg til MD5 fra xbmc.log til BiosIDs.ini. + + Sekundær DNS DHCP-server: Lag ny mappe Dim LCD ved avspilling Ukjent eller integrert (beskyttet) Dim LCD ved pause - Skru på LED ved pause - Filmer - Bibliotek - Spill-lagringer + + Videoer - Bibliotek + Sorter etter: ID - Last ned spill-lagringer - Lagret spill-lagring på harddisk - Klarte ikke å laste ned lagret spill - Velg spill-lagring for nedlasting og installering - Ingen online spill-lagringer funnet for det angitte spillet - Gå til spill-lagringer - Lagret spill + + + + + + + Spill del... Nullstill kalibrering Dette vil sette kalibreringen for %s til standardverdiene. Bla etter mål + Bruk mappenavn ved oppslag Fil Bruk fil- eller mappenavn ved oppslag? @@ -1696,7 +1851,8 @@ Sesong Laster ned informasjon om film Opphev tilordning av innhold - Oppdater informasjonen om TV-serie + + Oppdater informasjon om TV-serie Oppdater informasjon for alle episoder? Valgt mappe inneholder kun én TV-serie Ekskluder valgt mappe fra skanning @@ -1723,6 +1879,7 @@ Spill musikkvideo Hent bilder for skuespiller automatisk når en legger til i bibliotek Sett miniatyr for skuespiller + Fjern bokmerke for episode Sett bokmerke for episode Skraperinnstillinger @@ -1737,6 +1894,7 @@ Første gang sendt Forfatter Rens fil- og katalognavn + Aldri Hvis bare én sesong Alltid @@ -1766,12 +1924,15 @@ Lokalt lagret informasjon funnet. Ignorer og hent på nytt fra internett? Kunne ikke laste ned informasjon - Server er sannsynligvis utilgjengelig. + Fikk ikke kontakt med tjener. Vil du fortsette skanning? Land episode episoder + + Vis skjulte filer og mapper + TuxBox klient ADVARSEL: TuxBoxen er i opptaksmodus! Streamingen vil bli stoppet! @@ -1779,12 +1940,16 @@ Vil du starte streamingen? Kobler opp til: %s TuxBox enhet + + Legg til delt media.... Del video- og musikkbibliotek gjennom UPnP + Rediger delt media Fjern delt media Mappe for undertekst Film & alternativ mappe for undertekst + Aktiver mus Aktiver navigasjonslyder under medieavspilling Miniatyr @@ -1829,9 +1994,9 @@ etter siste ikke etter siste Skrapere - Standard skraper for film - Standard skraper for TV-serie - Standard skraper for musikkvideo + Standardskraper for film + Standardskraper for TV-serie + Standardskraper for musikkvideo Aktiver fallback basert på skraper-språk - Innstillinger Flerspråklig @@ -1868,8 +2033,9 @@ Fjernkontroll sender tastetrykk (tastatur) - Editer Internettilkobling kreves. - Hent mer... - Rot filsystem + Hent flere... + Rotfilsystem + Filnavn Filsti Filstørrelse @@ -1879,6 +2045,7 @@ Kommentar Farge/svart-hvit JPEG-prosess + Dato/tid Beskrivelse Kameramerke @@ -1903,6 +2070,7 @@ Lengdegrad (GPS) Høyde over havet (GPS) Orientering + Tilleggskategorier Nøkkelord Bildetekst @@ -1934,7 +2102,7 @@ Diskografi Søker etter artist Velg artist - Artist informasjon + Artistinformasjon Instrumenter Født Startet @@ -1944,9 +2112,14 @@ År aktiv Plateselskap Etablert/startet + + + Oppdater bibliotek ved oppstart - Oppdater alltid bibliotek i bakgrunnen + Ikke vis biblioteksoppdateringer som skjer i bakgrunnen - DNS suffiks + + %2.3fs Forsinket med: %2.3fs Framskyndet med: %2.3fs Tidsforskyvning for undertekst @@ -1968,6 +2141,8 @@ Vis filmfiler i lister DirectX forhandler: Direct3D versjon: + + Skrifttype - Størrelse - Farger @@ -1982,104 +2157,131 @@ hvitt/rødt hvitt/blått svart/hvitt + + Standardhandling for «velg» Velg - Show informasjon + Vis informasjon Mer... Spill alle + Tekst-tv utilgjengelig Aktiver tekst-tv Del %i Bufrer %i byte Stopper Kjører + + Ekstern spiller aktiv Trykk OK for å avslutte spilleren + Trykk OK når avspilling er ferdig - Add-on - Add-ons - Add-on valg - Add-on informasjon - Plugin - Skraper - Skjermsparerr + + Tillegg + Tillegg + Alternativer for tillegg + Informasjon om tillegg + + Mediekilder + Filminformasjon + Skjermsparer Skript Visualisering - Add-on repository - Undertekst - Sangtekst - TV informasjon - Musikk video informasjon - Album informasjon - Artist informasjon - Konfigurer Add-on - Deaktiver Add-on - Aktiver Add-on - Add-on deaktivert - Værtjeneste + Pakkebrønn for tillegg + Undertekster + Sangtekster + TV-informasjon + Musikkvideoinformasjon + Albuminformasjon + Artistinformasjon + + Konfigurer + Deaktiver + Aktiver + Tillegg deaktivert + Vær Weather.com (standard) - Denne Add-on kan ikke konfigureres + Dette tillegget kan ikke konfigureres Feil ved henting av innstillinger - Alle add-ons - Hent Add-ons + Alle tillegg + Hent tillegg Se etter oppdateringer - Tving oppdatering + Tvungen oppdatering Endringslogg Avinstaller Installer - Deaktivere Add-ons + Deaktivere tillegg (Tilbakestill innstilling) Installer fra zip-fil Laster ned %i%% Tilgjengelige oppdateringer - Tilgjengelige Add-ons + + Tilgjengelige tillegg Versjon: - Fraskrivelse: + Dementi: Lisens: Endringslogg - Vil du installere denne Add-on? - Hvorfor vil du deaktivere denne add-on? - Add-on oppdatering tilgjengelig! - Aktivere add-on + Vil du aktivere dette tillegget? + Vil du deaktivere dette tillegget? + Oppdatering for tillegg tilgjengelig! + Aktiverte tillegg Automatisk oppdatering - Add-on aktivert - Add-on oppdatert - Kansellere nedlasting av add-on? - Laster ned add-ons + Tillegg aktivert + Tillegg oppdatert + Avbryt nedlasting av tillegg? + Laster ned tillegg Oppdatering tilgjengelig Oppdater - Add-on kan ikke brukes - En ukjent feil har oppstått + + Tillegg kunne ikke lastes inn. + En ukjent feil har oppstått. Innstillinger påkrevet Kunne ikke koble til Må startes på nytt Deaktivere + Forsøk ny oppkobling? - Add-on starter på nytt - Lås Add-on manager - Add-on er markert som ødelagt i repository. - Vil du deaktivere den i systemet? + Tillegg starter på nytt + Lås tilleggsbehandler + + + + + + + + Tillegget er markert som ødelagt i pakkebrønnen. + Vil du deaktivere tillegget? Ødelagt + + Biblioteksmodus QWERTY-tastatur Passthrough-lyd i bruk - Aktiver flimmerfilter på spill - Søkelengde - Trailerkvalitet + + + + + + + + Kvalitet på trailer Strøm Last ned - Last ned & spill av - Last ned & lagre + Last ned og spill av + Last ned og lagre I dag I morgen Lagrer Kopierer Sett nedlastingsmappe + Søkelengde Kort Lang Bruk DVD-avspiller i stedet for vanlig avspiller Spør om nedlasting før filmer spilles Klipp - Omstart plugin for å aktivere + Omstart tillegg for å aktivere I kveld I morgen kveld Forhold @@ -2135,12 +2337,15 @@ Denne filen er stablet, velg den delen du vil spille fra. Sti til skript Aktiver knapp for egendefinert skript + + Lame Vorbis Wav DXVA2 VAAPI Flac + Høyttalerkonfigurasjon 2.0 2.1 @@ -2152,4 +2357,6 @@ 5.1 7,0 7.1 + + diff -Nru xbmc-10.00~svn33778/language/Polish/strings.xml xbmc-10.00~svn34731/language/Polish/strings.xml --- xbmc-10.00~svn33778/language/Polish/strings.xml 2010-09-06 21:00:12.000000000 +0000 +++ xbmc-10.00~svn34731/language/Polish/strings.xml 2010-10-04 17:44:50.000000000 +0000 @@ -2,9 +2,9 @@ - - - + + + Programy Zdjęcia @@ -85,6 +85,8 @@ Utwórz miniaturki Skróty Pauza + Błąd aktualizacji + Błąd instalacji Kopiuj Przenieś Usuń @@ -162,6 +164,7 @@ Nie znaleziono informacji Wybierz film: Wczytuję informacje o filmie + Interfejs WWW O filmie Krótki opis Głosy @@ -212,7 +215,7 @@ CDDB Pobieram informację o CD Błąd - Włącz czytanie tagów (metadanych) + Włącz obsługę tagów (metadanych) Otwieram Shoutcast Oczekuję na rozpoczęcie... @@ -242,7 +245,7 @@ Napisy Czcionka - Rozmiar - Wzmocnienie (Dynamic Range Compression) + Dynamiczna kontrola zakresu Wideo Dźwięk Wskaż napisy @@ -294,7 +297,7 @@ Rok Wzmocnij głośność przy downmixie Programy - Wył. + Wyłączone Przyciemnienie Czarny ekran Matrix @@ -530,6 +533,8 @@ Ścieżka do katalogu nie jest ustawiona. Zgraj utwór Wprowadź numer + Bitów/Próbkę + Próbkowanie Płyty CD Koder Jakość @@ -655,7 +660,7 @@ Wstępna przerwa przed powtórzeniem (ms) Właściwa przerwa przed powtórzeniem (ms) Maksymalna liczba klientów - Dostęp do Internetu + Internet Wprowadzono nieprawidłowy port Wartość musi być z przedziału 1-65535 Wartość musi być z przedziału 1024-65535 @@ -709,7 +714,7 @@ - Użytkownik Ustawienia skryptu Single - Wprwadź adres + Wprowadź adres Klient SMB Grupa robocza Domyślny użytkownik @@ -747,7 +752,7 @@ Wysyłaj nazwę użytkownika i hasło FTP Interwał pingu Połączyć z wykrytym systemem? - Rozgłoś te usługi do innych systemów poprzez funkcję Zeroconf + Rozgłoś te usługi do innych systemów poprzez Zeroconf Inne urządzenie audio Inne urządzenie przejścia zamiecie @@ -824,7 +829,7 @@ Programy Konfiguracja Prognoza pogody - Gry sieciowie + Gry sieciowe Rozszerzenia Informacje o systemie Muzyka - Biblioteka @@ -863,7 +868,7 @@ Wprowadź główne hasło Wprowadź kod odblokowujący albo naciśnij C, aby anulować - Wprowadź kombinacje przycisków na padzie + Wprowadź kombinację przycisków na padzie i naciśnij Start, aby zatwierdzić lub naciśnij Back, aby anulować. Ustaw zabezpieczenie Odblokuj @@ -920,6 +925,7 @@ Uruchom ponownie Minimalizuj Działanie przycisku zasilania + Wyłącz system Czy inna sesja jest aktywna, może przez ssh? Podłączono dysk przenośny Niebezpieczne odłączenie urządzenia @@ -946,7 +952,7 @@ Sinc VDPAU VDPAU poziom skalowania HQ - VDPAU koekcja poziomu kolorów (YCbCr i RGB) + VDPAU korekcja poziomu kolorów (YCbCr i RGB) Wygaszaj inne ekrany Wyłączone Wygaszaj ekrany @@ -1007,6 +1013,7 @@ Auto kontrola temperatury Kontrola obrotów wentylatora - Czcionki + Włącz odwrócone napisy (język arabski, hebrajski, ...) Pokazuj wiadomości RSS Pokazuj folder nadrzędny (..) Szablon nazewnictwa utworu @@ -1073,6 +1080,7 @@ Maskowanie głosu - port 3 Maskowanie głosu - port 4 Przewijanie oparte na czasie + Szablon nazewnictwa utworu - prawa strona Efekt Nie ma dostępnych efektów dla tej wizualizacji Nie ma dostępnych opcji dla tej wizualizacji @@ -1123,11 +1131,15 @@ Wysoka Bardzo wysoka (wolne!) Synchronizuj odtwarzanie z ekranem + Pauza podczas zmiany odświeżania + Wyłącz + %.1f sekunda + %.1f sekund(y) Pilot Apple - Zezwalaj na start XBMC za pomoca pilota + Zezwalaj na start XBMC za pomocą pilota Opóźnienie sekwencji Wyłączony - Standartowy + Standardowy Pilot uniwersalny Pilot do wszystkiego (Harmony) Błąd Pilota Apple @@ -1234,7 +1246,7 @@ Motyw skóry Domyślny Last.fm - Publikuj odtwarzane utwory do do Last.fm + Publikuj odtwarzane utwory do Last.fm Użytkownik Hasło Stan czuwania... @@ -1288,12 +1300,12 @@ Nie można pobrać listy z Last.fm... Wpisz nazwę wykonawcy, aby wyszukać pokrewnych Wpisz tag, aby znaleźć podobne - Utowry ostatnio odtwarzane przez %name% + Utwory ostatnio odtwarzane przez %name% Słuchaj Radia %name% Poleca z Last.fm Top tagi dla %name% Słuchaj playlisty %name% radia Last.fm - Napewno chcesz dodać ten utwór do ulubionych? - Napewno chcesz zablokować ten utwór? + Na pewno chcesz dodać ten utwór do ulubionych? + Na pewno chcesz zablokować ten utwór? Dodano do ulubionych: '%s'. Nie można dodać '%s' do ulubionych. Zablokowano: '%s'. @@ -1308,7 +1320,7 @@ Nie mogę połączyć się z serwerem Nie znaleziono żadnego serwera Grupa robocza nie została odnaleziona - Otwieranie wielościeżkowego źróła + Otwieranie wielościeżkowego źródła Ścieżka: Ogólne Przeszukuję w Internecie @@ -1338,7 +1350,7 @@ Przejrzyj plik dziennika (log). Tryb Imprezy przerwany. Nie ma utworów spełniających twoje kryteria. - Nie można zainicjalizować bazy danych. + Nie można utworzyć bazy danych. Nie można otworzyć bazy danych. Nie można pobrać utworów z bazy danych. Playlista Trybu Imprezy @@ -1465,9 +1477,9 @@ Wprowadzenie hasła głównego uaktywnia tryb administratora czy może raczej skopiować je z profilu domyślnego? Zapisać zmiany w profilu? - Znalaziono poprzednie ustawienia. + Znaleziono poprzednie ustawienia. Czy chcesz je przywrócić? - Znalaziono poprzednie źródła mediów. + Znaleziono poprzednie źródła mediów. - Powiększenie Ustawienia UPnP Autostart klienta UPnP @@ -1532,7 +1544,7 @@ Otoczenie sieciowe Windows (SMB) Serwer XBMSP Serwer FTP - ITunes (DAAP) + iTunes (DAAP) Serwer UPnP Pokazuj info o filmie Gotowe @@ -1632,7 +1644,7 @@ Odśwież informację o serialu Odświeżyć dane dla wszystkich odcinków? Wybrany katalog zawiera jeden serial - Wyklucz wybrane katalogi ze skanowia + Wyklucz wybrane katalogi ze skanowania Specjalne Automatycznie pobieraj ikony sezonu Wybrany katalog zawiera jeden plik wideo @@ -1664,7 +1676,7 @@ Zwiastun Tylko tytuły Pomiń podział na sezony - Pobierz FanArt + Pobierz Fanart Fanart jako tło w trybie biblioteki Wyszukiwanie nowych pozycji Premiera @@ -1694,7 +1706,7 @@ Fanart z Internetu Zmień typ zawartości Odświeżyć informacje dla wszystkich - pozycji związanych z tą scieżką? + pozycji związanych z tą ścieżką? Fanart Informacja lokalna znaleziona. Zignorować i odświeżyć z Internetu? @@ -1763,7 +1775,7 @@ Domyślny dla filmów Domyślny dla seriali Domyślny dla teledysków - Włącz fallback bazujący na języku scrapera + Włącz powrót bazując na języku scrapera - Ustawienia wielojęzyczny Brak scraperów @@ -1796,7 +1808,7 @@ Kodek audio Język dialogów Język napisów - Przyciski pilota emulują naciśniecia klawiszy + Przyciski pilota emulują naciśnięcia klawiszy - Edytuj Wymagane połączenie z Internetem. Pobierz więcej... @@ -1917,7 +1929,7 @@ Pokaż informacje Więcej... Odtwórz wszystko - Teletext niedostępny + Teletekst niedostępny Włącz Teletekst Część %i Ładowanie %i bajtów @@ -1957,7 +1969,7 @@ Lista zmian Usuń Instaluj - Wyłącz wtyczkę + Wyłączone wtyczki (Wyczyść bieżące ustawienie) Instaluj z pliku zip Pobieram %i%% @@ -1970,7 +1982,7 @@ Czy chcesz włączyć tę wtyczkę? Czy chcesz wyłączyć tę wtyczkę? Dostępna aktualizacja wtyczki! - Włącz wtyczki + Włączone wtyczki Auto aktualizacja Wtyczka włączona Wtyczka zaktualizowana @@ -1993,10 +2005,9 @@ Tryb biblioteki Klawiatura QWERTY Używasz bezpośredniego przejścia dźwięku - Czas trwania - Jakość obrazu - Odtwarzanie strumieniowe - Pobieranie + Jakość zwiastunu + Strumieniuj + Pobierz Pobierz i odtwarzaj Pobierz i zapisz Dzisiaj @@ -2004,6 +2015,7 @@ Zapisywanie Kopiowanie Zapisz do + Czas przeszukiwania Krótki Długi Użyj odtwarzacza DVD zamiast zwykłego @@ -2059,7 +2071,7 @@ Lubię Nie lubię Plik znajduje się w stosie, wybierz część którą chcesz odtwarzać. - Scieżka do skryptu + Ścieżka do skryptu Włącz własny przycisk dla skryptu Lame Vorbis diff -Nru xbmc-10.00~svn33778/language/Portuguese/strings.xml xbmc-10.00~svn34731/language/Portuguese/strings.xml --- xbmc-10.00~svn33778/language/Portuguese/strings.xml 2010-09-13 15:38:33.000000000 +0000 +++ xbmc-10.00~svn34731/language/Portuguese/strings.xml 2010-10-07 11:35:58.000000000 +0000 @@ -1,6 +1,6 @@ - - + + Programas @@ -89,7 +89,8 @@ Criar miniaturas Atalhos Pausa - + Actualização falhou + Instalação falhou Copiar Mover Apagar @@ -563,6 +564,8 @@ CDDARipPath não está definido. Ripar faixa de áudio Insira número + Bits/Amostra + Frequência da amostra CDs de áudio Codificação @@ -1017,6 +1020,7 @@ Reiniciar Minimizar Acção do botão desligar + Desligar sistema Estará outra sessão activa, talvez em ssh? Disco rígido amovível montado @@ -1260,6 +1264,11 @@ Muito Alta (Lento) Sincronizar vídeo com ecrã + Pausar durante mudança de taxa de actualização + Off + %.1f Segundo + %.1f Segundos + Comando da Apple Permitir início do XBMC com controlo remoto @@ -2242,7 +2251,7 @@ A guardar A copiar Definir pasta para descarregar - Tempo de busca + Tempo de busca Curto Longo Usar reprodutor de DVD em vez do reprodutor normal diff -Nru xbmc-10.00~svn33778/language/Portuguese (Brazil)/strings.xml xbmc-10.00~svn34731/language/Portuguese (Brazil)/strings.xml --- xbmc-10.00~svn33778/language/Portuguese (Brazil)/strings.xml 2010-09-06 21:00:12.000000000 +0000 +++ xbmc-10.00~svn34731/language/Portuguese (Brazil)/strings.xml 2010-09-28 13:27:57.000000000 +0000 @@ -3,7 +3,7 @@ - + Programas @@ -92,7 +92,8 @@ Criar ícones Atalhos Pausado - + Falha na atualização + Falha na instalação Copiar Mover Excluir @@ -177,6 +178,7 @@ Selecione o filme: Procurando informação de %s Carregando detalhes do filme + Interface web Título: Sinopse: @@ -403,6 +405,7 @@ Sem cache Excluir filme da coleção Deseja excluir '%s'? + De %s até %i %s Disco removível Abrindo arquivo @@ -1270,7 +1273,12 @@ Médio Alto Realmente alto(lento!) - Sincronizar reprodução com a exibição + Sincronizar reprodução com a exibição + + Pausa durante alteração na taxa de atualização + Desligado + %.1f Segundo + %.1f Segundos Controle Remoto Apple @@ -2272,7 +2280,7 @@ Salvando Copiando Definir diretório para download - Duração da busca + Duração da busca Curto Longo Utilizar tocador de DVD ao invés de tocador regular diff -Nru xbmc-10.00~svn33778/language/Romanian/langinfo.xml xbmc-10.00~svn34731/language/Romanian/langinfo.xml --- xbmc-10.00~svn33778/language/Romanian/langinfo.xml 2010-08-27 15:53:55.000000000 +0000 +++ xbmc-10.00~svn34731/language/Romanian/langinfo.xml 2010-09-28 13:27:57.000000000 +0000 @@ -15,16 +15,16 @@ DD.MM.YYYY - DDDD, D MMMM, YYYY + DDDD, D MMMM YYYY h:mm:ss xx C kmh - GMT+2 + EET - + DD.MM.YYYY - DDDD, D MMMM, YYYY + DDDD, D MMMM YYYY h:mm:ss xx C kmh diff -Nru xbmc-10.00~svn33778/language/Romanian/strings.xml xbmc-10.00~svn34731/language/Romanian/strings.xml --- xbmc-10.00~svn33778/language/Romanian/strings.xml 2010-08-27 15:53:55.000000000 +0000 +++ xbmc-10.00~svn34731/language/Romanian/strings.xml 2010-09-28 13:27:57.000000000 +0000 @@ -1,5 +1,5 @@ - + Programe Imagini @@ -20,18 +20,18 @@ Sâmbătă Duminică - Ianuarie - Februarie - Martie - Aprilie - Mai - Iunie - Iulie - August - Septembrie - Octombrie - Noiembrie - Decembrie + ianuarie + februarie + martie + aprilie + mai + iunie + iulie + august + septembrie + octombrie + noiembrie + decembrie Lun Mar @@ -41,27 +41,45 @@ Sâm Dum - Ian - Feb - Mar - Apr - Mai - Iun - Iul - Aug - Sep - Oct - Nov - Dec + ian + feb + mar + apr + mai + iun + iul + aug + sep + oct + nov + dec + + N + NNE + NE + ENE + E + ESE + SE + SSE + S + SSV + SV + VSV + V + VNV + NV + NNV + VAR Vizualizare: Automat Vizualizare: Automat mare Vizualizare: Pictograme Vizualizare: Listă Scanare - Sortează după: Nume - Sortează după: Dată - Sortează după: Dimensiune + Sort. după: Nume + Sort. după: Dată + Sort. după: Mărime Nu Da Start diapozitive @@ -69,7 +87,8 @@ Creează miniaturi Scurtături Pauză - + Actualizarea a eșuat + Instalarea a eșuat Copiază Mută Șterge @@ -77,10 +96,10 @@ Dosar nou Confirmare copiere fișier Confirmare mutare fișier - Confirmare ștergere fișier? + Confirmare ștergere fișier Copiați aceste fișiere? Mutați aceste fișiere? - Ștergeți aceste fișiere? - Ștergerea fișierelor nu poate fi anulată! + Ștergeți aceste fișiere? ATENȚIE: Ștergerea fișierelor nu poate fi anulată! Stare Obiecte Generale @@ -92,7 +111,7 @@ Cântece Genuri Liste de redare - Căută + Caută Informații sistem Temperaturi: CPU: @@ -125,7 +144,7 @@ Rezoluție - Ajustează rată reîmprospătare ecran pentru potrivire cu video + Ajustare rată reîmprospătare ecran pentru potrivire cu video Dată de lansare @@ -136,34 +155,35 @@ Cântec Durată - Selectează album + Selectați album Piste Prezentare - Reîmprospătează + Actualizează Căutare album OK Nu a fost găsit niciun album! Selectează toate - Se scanează informațiile media + Se scanează informații media Salvează Amestecă - Eliberează + Golește Scanează Se caută... Nu s-au găsit informații! - Selectează film: - Se cer %s informații - Se descarcă detalii film + Selectați filmul: + Se cer informații pe %s + Se descarcă informații film + Interfață web Citat - Scurtă descriere: + Scurtă descriere Voturi Distribuție Intrigă Redă - Următor - Anterior + Următorul + Precedentul Calibrare interfață utilizator... Calibrare video... Atenuare @@ -194,6 +214,8 @@ Ecran complet #%d În fereastră Rată de reîmprospătare + Ecran complet + Dimensionare: (%i,%i)->(%i,%i) (zoom x%2.2f) AR:%2.2f:1 (pixeli: %2.2f:1) Scripturi Limbă @@ -240,7 +262,7 @@ Comprimare interval dinamic Video Audio - Răsfoiți după subtitrări + Răsfoire după subtitrări Creează semn de carte Elimină semne de carte Decalaj audio @@ -259,7 +281,7 @@ (0=automat) - Reorganizare bază de date + Curățare bază de date Pregătire... Eroare bază de date Se caută cântece... @@ -280,7 +302,7 @@ Se comprimă baza de date... Eroare comprimare bază de date Doriți să curățați mediateca? - Curăță mediatecă... + Curățare mediatecă... Pornește Conversie rată de cadre Ieșire audio @@ -298,13 +320,13 @@ Întunecat Negru Matrix - Așteptare activare ecran de veghe + Așteptare pentru activare ecran de veghe Mod ecran de veghe Timp de așteptare pentru închidere Toate albumele Albume adăugate recent Ecran de veghe - Prezentare diapozitive recursiv + Prezentare recurs. Nivel de întunecare ecran de veghe Sortează după: Fișier - Receptor capabil Dolby Digital (AC3) @@ -313,56 +335,56 @@ Sortează după: Notă IMDb Titlu - Furtuni(cu trăznete) - Parțial - În general + furtuni(cu trăznete) + parțial + în general însorit înnorat - Zăpadă - Ploaie - Ușor + zăpadă + ploaie + slab AM PM - Averse de ploaie - Puțin - împrăștiați - Vânt + averse de ploaie + slab + pe alocuri + vânt puternic senin - Senin - Nori - Devreme - Aversă de ploaie - Ninsoare + senin + nori + devreme + aversă de ploaie + ninsoare scăzut mediu ridicat - Ceață - Ceață ușoară - Selectează locația + ceață + ceață ușoară + Selectați locație Interval de reîmprospătare Unități de măsurare temperatură Unități de măsurare viteză Meteo Temp - Se simpte + Se simte Index UV Vânt Punct de rouă Umiditate - Dinspre - cu + + Implicit Se accesează serviciul de prognoză Se obține prognoza pentru: - Nu se pot obține datele despre vreme + Nu se pot obține date despre vreme Manual Nicio prezentare pentru acest album Se descarcă miniatura... Indisponibil Vizualizare: Pictograme mari - minim - maxim + Minim + Maxim HDMI Șterge informații album @@ -377,6 +399,7 @@ Fără cache Elimină filmul din mediatecă Sigur eliminați '%s'? + Dinspre %s cu %i %s Disc detașabil Se deschide fișierul @@ -446,7 +469,7 @@ Activează vizualizări Activează schimbare mod video Fereastră de pornire - Prima fereastră + Fereastră inițială Setări manuale Gen @@ -463,11 +486,11 @@ Adaugă în mediatecă manual Introduceți titlu Eroare: Titlu duplicat - Selectează gen + Selectați gen Gen nou Adăugare manuală Introduceți gen - Afișare: %s + Vedere: %s Listă Pictograme Listă mare @@ -486,9 +509,9 @@ Sort. după: %s Nume Dată - Dimensiune + Mărime Pistă - Timp + Durată Titlu Artist Album @@ -516,7 +539,7 @@ Ține minte vizualizările pentru dosare diferite Ascendent Descendent - Editează lista de redare + Modifică lista de redare Filtrare Anulează mod petrecere Mod petrecere @@ -566,29 +589,29 @@ Decupare benzi negre Un fișier mare trebuie dezarhivat. Continuați? Elimină din mediatecă - Exportă videotecă - Importă videotecă + Exportă mediateca video + Importă mediatecă Se importă Se exportă - Alege mediatecă + Alegere mediatecă Ani - Actualizează mediatecă + Actualizează mediateca Arată informații de depanare - Caută executabil - Caută listă de redare - Alegeți dosar + Alegere executabil + Alegere listă de redare + Alegere dosar Informații cântec Întindere non-liniară Amplificare volum - Alege dosar de export + Alegere dosar de export Acest fișier nu mai este disponibil. - Doriți să îl eliminați din bibliotecă? + Doriți să îl eliminați din mediatecă? Caută script Nivel de comprimare - Se reorganizează biblioteca - Se elimină cântecele vechi din bibliotecă + Se curăță mediateca + Se elimină cântecele vechi din mediatecă Această cale a mai fost scanată Rețea - Server @@ -607,7 +630,7 @@ - Mască de rețea - Gateway implicit - Server DNS - Salvează & repornește + Salvează și repornește Adresa specificată nu este validă. Standardul este AAA.BBB.CCC.DDD cu numere între 0 și 255. Modificările nu au fost salvate. Continuați fără a le salva? @@ -616,7 +639,7 @@ - Port - Salvează & aplică + Salvează și aplică - Parolă Nicio parolă - Set de caractere @@ -630,7 +653,7 @@ Galben Fișiere Nicio informație scanată pentru această săptămână - Vă rugăm opriți modul bibliotecă + Vă rugăm opriți modul mediatecă Eroare la încărcarea imaginii Modifică cale Oglindire imagine @@ -694,7 +717,7 @@ Doriți să îl adăugați oricum? Adresă IP - Adaugă locație rețea + Adăugare locație rețea Protocol Adresă server Nume server @@ -702,23 +725,23 @@ Dosar partajat Port Utilizator - Caută server de rețea + Alegere server rețea Introduceți adresa de rețea a serverului Introduceți calea de pe server Introduceți număr port Introduceți nume utilizator - Adaugă %s sursă + Adăugare sursă %s Introduceți căile sau alegeți locații media. Introduceți un nume pentru această sursă media. - Răsfoiți după partajare nouă + Răsfoire după partajare nouă Alege Nu se pot obține informații dosar. Adaugă sursă - Modifică sursă - Modifică %s sursă + Modifică sursa + Modificare sursă %s Introduceți noua etichetă - Alegeți imagine - Alegeți dosar de imagini + Alegere imagine + Alegere dosar de imagini Adaugă locație rețea... Caută fișier Submeniu @@ -730,9 +753,9 @@ Se încarcă directorul S-au obținut %i elemente S-au obținut %i din %i elemente - Suplimente program - Setează miniatură modul - Setări modul + Suplimente programe + Setează miniatură supliment + Setări supliment Puncte de acces Altele... - Utilizator @@ -753,25 +776,25 @@ Video Imagini Fișiere - Muzică & video - Muzică & imagini - Muzică & fișiere - Video & imagini - Video & fișiere - Imagini & fișiere - Muzică & video & imagini - Muzică & video & imagini & fișiere + Muzică și video + Muzică și imagini + Muzică și fișiere + Video și imagini + Video și fișiere + Imagini și fișiere + Muzică, video și imagini + Muzică, video, imagini și fișiere Dezactivat - Fișiere & muzică & video - Fișiere & imagini & muzică - Fișiere & imagini & video - Muzică & programe - Video & programe - Imagini & programe - Muzică & video & imagini & programe - Programe & video & muzică - Programe & imagini & muzică - Programe & imagini & video + Fișiere, muzică și video + Fișiere, imagini și muzică + Fișiere, imagini și video + Muzică și programe + Video și programe + Imagini și programe + Muzică, video, imagini și programe + Programe, video și muzică + Programe, imagini și muzică + Programe, imagini și video @@ -791,31 +814,34 @@ Dispozitiv audio specific Dispozitiv de traversare specific - Curenți + curenți și - Îngheț - Târziu - Izolat - Ploi cu tunete - Tunet - Soare - Greu + îngheț + târziu + izolat + ploi cu tunete + tunet + soare + greu în - Apropiere - Gheață - Cristale - Calm + apropiere + gheață + cristale + calm cu mult vânt burniță - Furtună cu trăznete - Burniță - Încețoșat - Picățele - Furtuni - Averse - Moderat + furtună cu trăznete + burniță + încețoșat + picățele + furtuni + averse + moderat + foarte ridicat + mult vânt + ceață @@ -825,7 +851,7 @@ Durată Scriptul a eșuat! : %s - Este necesară o versiune mai nouă - Vedeți jurnalul + Este necesară o versiune mai nouă - Vedeți istoric modificări @@ -870,8 +896,8 @@ Muzică/Fișiere Muzică/Mediatecă Editor listă de redare - Top 100 cântece - Top 100 albume + Top 100 de cântece + Top 100 de albume Programe Configurație Previziune meteo @@ -879,10 +905,10 @@ Extensii Informații sistem - Muzică - Mediatecă - În redare - Muzică + Mediatecă audio + Muzică - În redare - În redare - Filme + Filme - În redare Informații album Informații film @@ -936,7 +962,7 @@ Resetează blocare Elimină blocare Parolă numerică - Combinație de butoane gamepad + Combinație butoane gamepad Parolă completă Introduceți noua parolă Reintroduceți noua parolă @@ -955,7 +981,7 @@ Oprește sistemul dacă s-a ajuns la limita încercărilor pentru Blocarea principală Codul principal nu este valid Introduceți un cod principal valid - Setări & gestionar de fișiere + Setări și gestionar de fișiere Setează ca implicit pentru toate filmele Vor fi resetate toate valorile salvate anterior Durată de afișare pentru fiecare imagine @@ -995,6 +1021,7 @@ Repornire Minimizează Acțiune buton de pornire (power) + Închidere sistem Este activă o altă sesiune, poate peste ssh? Disc dur detașabil montat @@ -1080,6 +1107,8 @@ Pornit, alarmă în %i minute Alarmă! Anulat cu %i m %i s rămase + %2.0fm + %2.0fs Caută subtitrări în arhive RAR Caută subtitrare... @@ -1119,10 +1148,10 @@ Viteză ventilator Control temperatură automat Înlocuire viteză ventilator - - Font + - Fonturi Activează inversare pentru textele bi-direcționale Afișează fluxuri de știri RSS - Arată elementele din dosarul părinte + Arată elemente dosar părinte Model de numire piste Doriți să reporniți sistemul în loc de XBMC? @@ -1167,7 +1196,7 @@ Scanează pentru conținut nou În redare... Informații album - Scanează în fonotecă + Scanează în mediatecă Oprește scanarea Metodă de redare Pixel shader de calitate slabă @@ -1203,11 +1232,11 @@ Scurtături Ignoră articolele la sortare (ex: "the") Suprapune cântece din același album - Răsfoiește după %s + Răsfoire după %s Arată poziția pistei - Curăță implicit + Elimină implicit Reia - Obține miniatură + Obține afiș Informații imagine %s predefiniri (IMDb aprecieri utilizatori) @@ -1236,16 +1265,21 @@ Pixel shaders Metodă sincronizare A/V - Ceas audio - Ceas video (aruncă/duplică audio) - Ceas video (reeșantionază audio) + ceas audio + ceas video (aruncă/duplică audio) + ceas video (reeșantionează audio) Grad maxim de reeșantionare (%) Calitate reeșantionare Jos(rapid) Mediu Înalt Foarte înalt(încet!) - Sincronizează redarea cu ecranul + Sincronizare redare cu reîmprospătare ecran + + Pauză în timp ce se schimbă rata de reîmprospătare + Oprit + %.1f secundă + %.1f secunde Telecomandă Apple @@ -1277,10 +1311,10 @@ Niciun fișier și cel puțin o miniatură Cel puțin un fișier și o miniatură Percentaj miniaturi - Opțiuni afișare - Schimbă cod regiune 1 - Schimbă cod regiune 2 - Schimbă cod regiune 3 + Opțiuni vedere + Schimbare cod regiune 1 + Schimbare cod regiune 2 + Schimbare cod regiune 3 Mediatecă Fără TV Introduceți cel mai apropiat oraș mare @@ -1314,7 +1348,7 @@ Folosește scanarea pe fundal Oprește scanarea - Nu este posibil în timp ce se scanează pentru informații media + Imposibil în timpul scanării pentru informații media Efect granularitate film Caută miniaturi pe partajări la distanță Preîncărcare tip necunoscut - Internet @@ -1334,7 +1368,7 @@ Folosește ora de vară Adaugă la favorite Elimină din favorite - - Culoare + - Culori Țară fus orar Fus orar Liste de fișiere @@ -1396,7 +1430,7 @@ Libre.fm Trimitere cântece - Trimite radio Last.fm către Last.fm + Trimite cântece radio Last.fm către Last.fm Se conectează cu Last.fm... Se selectează stația... Caută artiști similari... @@ -1436,7 +1470,7 @@ Doriți să adăugați piesa curentă la piesele îndrăgite? Doriți să blocați piesa curentă? Adaugată la piesele îndrăgite: '%s'. - Nu se poate adăuga '%s' la piesele dumneavoastră îndragite. + Nu se poate adăuga '%s' la piesele dumneavoastră îndrăgite. Blocată: '%s'. Nu se poate bloca '%s'. Piese îndrăgite recent de %name% @@ -1446,7 +1480,7 @@ Doriți să eliminați această piesă din piesele îndrăgite? Doriți să deblocați această piesă? - Cale nu a putut fi găsită sau nu este validă + Calea nu a putut fi găsită sau nu este validă Nu s-a putut conecta la serverul de rețea Niciun server găsit Grupul de lucru nu a fost gasit @@ -1554,11 +1588,11 @@ Liste de redare video Doriți să lansați acest joc? Sortează după: Listă de redare - Miniatură la distanță - Miniatură curentă - Miniatură locală - Nicio miniatură - Alege miniatură + Afiș la distanță + Afiș curent + Afiș local + Niciun afiș + Alegere afiș @@ -1569,18 +1603,18 @@ - Sumar - Blochează fereastră muzică - Blochează fereastră filme - Blochează fereastră imagini - Blochează ferestre programe și scripturi - Blochează gestionar de fișiere - Setări blocare - Pornire nouă - Intră în modul principal - Părăsește modul principal + Rezumat + Blochează fereastra de muzică + Blochează fereastra de filme + Blochează fereastra de imagini + Blochează ferestrele programe și scripturi + Blochează gestionarul de fișiere + Configurare blocare + Pornește nou + Intrare în modul principal + Părăsire mod principal Creeați profilul '%s'? - Pornește cu setări noi + Porniți cu setări noi Cel mai bun disponibil Schimbă automat între 16x9 și 4x3 Tratează fișierele în stivă ca fișiere singulare @@ -1591,19 +1625,19 @@ Elimină miniatură Adaugă profil... - Cere informații pentru toate albumele + Cere info pt. toate albumele Informații media Separă Partajări implicite Partajări implicite (doar citire) - Copiere implicită + Copiază implicit Imagine profil Preferințe blocare - Modifică profilul + Modificare profil Blocare profil Dosarul nu poate fi creat Director profil - Pronește cu surse media proaspete + Porniți cu surse media noi Verifică dacă în dosarul selectat se poate scrie și dacă noul nume al dosarului este valid Clasă MPAA @@ -1624,7 +1658,7 @@ Spațiu liber pe disc Introduceți numele unei partajări existente Cod de blocare - Încarcă profil + Încarcă profilul Nume profil Surse media Introduceți codul de blocare profil @@ -1634,9 +1668,9 @@ CD-ul sau pista nu pot fi copiate în timp ce se redă de pe CD Cod de blocare principal și setări Introducând codul de blocare principal activează întotdeauna modul principal - sau copiază de la implicit? + sau copiați de la implicit? Salvați modificările în profil? - Setăriile vechi au fost găsite. + Au fost găsite setăriile vechi. Doriți să le folosiți? Sursele media vechi au fost găsite. Separă (blocat) @@ -1658,7 +1692,7 @@ Amestecare băuturi Umplere pahare Autentificat ca - Deautentificare + Dezautentificare Du-te la rădăcină Weave Weave (inverted) @@ -1685,7 +1719,7 @@ Renunță la cronomentru de închidere Blochează preferințele pentru %s Alege... - Sumar + Rezumat informații Informații stocare Informații disc dur (hard disk) Informații DVD-ROM @@ -1716,7 +1750,7 @@ Spațiu Reîncarcă costum Rotește imaginile folosind informațiile EXIF - Folosește stiluri vizualizare poster pentru serialele TV + Folosește stiluri vizualizare afiș pentru serialele TV Vă rugăm așteptați @@ -1724,11 +1758,11 @@ Particularizat Activează jurnalizare depanare Descarcă informații adiționale în timpul actualizărilor - Serviciu implicit pentru informații album - Serviciu implicit pentru informații artist + Serviciu implicit pentru informații albume + Serviciu implicit pentru informații artiști Schimbă scraper - Exportă fonotecă - Importă fonotecă + Exportă mediateca audio + Importă mediatecă Niciun artist găsit! Descărcarea informațiilor despre artist a eșuat @@ -1757,9 +1791,9 @@ Necunoscut sau integrat (protejat) Întunecă LCD în pauză - Filme - Mediatecă + Mediatecă video - Sortează după: ID + Sort. după: ID @@ -1776,7 +1810,7 @@ Folosește nume dosare la căutări Fișier Folosește nume fișier sau nume dosar la căutări? - Alege conținut + Alegere conținut Dosar Caută conținut recursiv? Deblochează surse @@ -1787,7 +1821,7 @@ acestei căi din mediateca XBMC? Filme Seriale - Acest director conține + Acest dosar conține Execută scanare automată Scanează recursiv ca @@ -1799,7 +1833,7 @@ Se încarcă detaliile serialului Se obține ghid episoade Se încarcă informații pentru episoadele din director - Selectează serial: + Selectați serial: Introduceți numele serialului Sezon %i Episod @@ -1810,7 +1844,7 @@ Serial Intrigă episod * Toate sezoanele - Ascundere privite + Ascunde privite Cod producție Arată intrigă pentru elementele neprivite * Ascuns pentru a preveni descoperirea acțiunii * @@ -1818,7 +1852,7 @@ Imagine sezon Sezon Se descarcă informații film - Elimină atribuire conținut + Eliminare atribuire conținut Titlu original Reîmprospătează informații serial Reîmprospătare informații pentru toate episoadele? @@ -1832,36 +1866,36 @@ Filme adăugate recent Episoade adăugate recent Studiouri - Videoclipuri muzică - Videoclipuri muzică adăugate recent - Videoclip muzică - Elimină videoclip muzică din mediatecă - Informații videoclip muzică - Se încarcă informații videoclip muzică + Videoclipuri + Videoclipuri adăugate recent + Videoclip + Eliminare videoclip din mediatecă + Informații videoclip + Se descarcă informații videoclip Amestecat Du-te la albume după artist Du-te la album Redă cântec - Du-te la videoclipuri muzică din album - Du-te la videoclipuri muzică după artist - Redă videoclip muzică - Descarcă miniaturi actor la adăugare în mediatecă + Du-te la videoclipuri din album + Du-te la videoclipuri după artist + Redă videoclip + Descarcă miniaturi actori la adăugare în mediatecă Setează miniatură actor Elimină semn de carte episod Setează semn de carte episod Setări scraper - Se descarcă informații videoclip muzică + Se descarcă informații videoclip Se descarcă informații serial Trailer Netezire - Netezește seriale + Netezire seriale Obține Fanart Arată Fanart în mediateciile de filme și muzică Se scanează pentru conținut nou Prima difuzare Scenarist - Curăță nume fișier sau dosar + Curăță numele fișierelor și dosarelor niciodată doar dacă este un singur sezon @@ -1869,27 +1903,27 @@ Are trailer Fals Prezentare diapozitive Fanart - Exportă către un singur fișier sau fișiere - separate pentru fiecare intrare? + Exportați către un singur fișier sau + fișiere separate pentru fiecare intrare? Un singur fișier Separat - Exportare miniaturi și fanart? + Exportare miniaturi și Fanart? Suprascrie fișierele vechi? Exclude calea din actualizăriile mediatecii Extrage miniaturi și informații video Seturi Setează miniatură set de filme Exportare miniaturi actor? - Alege fanart + Alegere Fanart Fanart local - Fără fanart + Fără Fanart Fanart curent Fanart la distanță - Schimbă conținut + Schimbare conținut Doriți să reîmprospătații informațiile pentru toate elementele din această cale? Fanart - Informațiile stocale local au fost găsite. + Au fost găsite informații stocate local. Ignorați și reîmprospătați de pe Internet? Nu se pot descărca informații Imposibil de conectat cu serverul la distanță @@ -1915,12 +1949,12 @@ Modifică partajare media Elimină partajare media - Dosar subtitrare + Dosar de subtitrări Director de film și subtitrare alternativă Activare mouse Emite sunete de navigare în timpul redării media - Miniatură + Miniaturi Regiune forțată lector DVD Ieșire video Aspect video @@ -1931,7 +1965,7 @@ Activează 720p Activează 1080i Introduceți nume pentru listă de redare nouă - Arată butoane "Adaugă sursă" în listele de fișiere + Arată buton "Adaugă sursă" în listele de fișiere Activează bări de derulare Afișare filtrare privite ca un comutator în mediateca video Deschide @@ -1956,15 +1990,15 @@ începe cu se termină cu mai mare decât - mai mic decât + mai mică decât după înainte în ultimul nu în ultimul Scrapers - Scraper de film implicit - Scraper de serial implicit - Scraper de videoclip muzică implicit + Scraper implicit pentru filme + Scraper implicit pentru seriale tv + Scraper implicit pentru videoclipuri muzicale Activează revenire bazată pe limbă scraper - Setări Multilingual @@ -1977,12 +2011,12 @@ toate regulile una sau mai multe reguli Limitează la - Fără limită - Sortare după + fără limită + Sortează după ascendent descendent - Modifică listă de redare inteligentă - Numele litei de redare + Modificare listă de redare inteligentă + Nume listă de redare Găsește elemente unde Modifică %i elemente @@ -2000,7 +2034,7 @@ Limbă subtitrare Telecomanda trimite apăsări de taste - Editare - Este necesară conexiune la Internet. + Este necesară o conexiune la Internet. Obține mai multe... Sistem de fișiere rădăcină @@ -2027,7 +2061,7 @@ Durată expunere Favorizare expunere Mod expunere - Flash folosit + Bliț folosit Balanță alb Sursă de lumină Mod măsurare @@ -2041,7 +2075,7 @@ Categorii suplimentare Cuvinte cheie - Etichetă + Titlu Autor Titlu de ziar Instrucțiuni speciale @@ -2063,30 +2097,31 @@ Permite controlul XBMC prin UPnP Încearcă să sari peste introducere înainte de meniul DVD Muzică salvată - Cere informații pentru toți artiștii + Cere info pt. toți artiștii Se descarcă informații album Se descarcă informații artist Biografie Discografie Se caută artist - Selectează artist + Selectați artist Informații artist Instrumente Născut - Format + Formată Teme Desființată Mort - Ani de activitate + Ani activi Etichetă Născut/Format Actualizează mediateca la pornire - Ascunde progresul actualizăriilor mediatecii + Ascunde progres pentru actualizări mediatecă - Sufix DNS + %2.3fs În urmă cu: %2.3fs În avans cu: %2.3fs Decalaj subtitrare @@ -2128,7 +2163,7 @@ Acțiune implicită selectare Alege Arată informații - Mai mult... + Mai multe... Redă toate Teletextul nu este disponibil @@ -2151,17 +2186,17 @@ Informații supliment Surse media - Informații film + Informații filme Ecran de veghe Script Vizualizare - Depozit supliment + Depozit de suplimente Subtitrări Versuri - Informații TV - Informații videoclip muzică - Informații album - Informații artist + Informații seriale tv + Informații videoclipuri + Informații albume + Informații artiști Configurează Dezactivează @@ -2180,7 +2215,7 @@ Instalează Suplimente dezactivate (Elimină setarea curentă) - Instalează din fișier zip + Instalare din fișier zip Se descarcă %i%% Actualizări disponibile @@ -2193,7 +2228,7 @@ Doriți să dezactivați acest supliment? Actualizare supliment disponibilă! Suplimente activate - Actualizează automat + Actualiz. automată Supliment activat Supliment actualizat Renunțați la descărcarea suplimentului? @@ -2209,7 +2244,7 @@ Dezactivează Încercați reconectarea? Reporniri supliment - Gestionar blocare supliment + Blochează gestionarul de suplimente @@ -2242,7 +2277,7 @@ Se salvează Se copiază Alegere dosar de descărcare - Durată căutare + Durată căutare Scurt Lung Folosește lector DVD în loc de lector normal @@ -2264,7 +2299,7 @@ Perspectivă Acoperire Traduce text - Listă hartă %s categorie + Listă hartă categorie %s 36 ore Hărți La fiecare oră @@ -2294,8 +2329,8 @@ Fundale personalizate Vedeți Citește-mă Vedeți Istoric modificări - Această versiune %s necesită un - XBMC revizie %s sau mai mare pentru a rula. + Această versiune de %s necesită o + revizie XBMC egală cu %s sau mai mare pentru a rula. Vă rugăm actualizați XBMC. Nu au fost găsite date! Pagina următoare diff -Nru xbmc-10.00~svn33778/language/Russian/strings.xml xbmc-10.00~svn34731/language/Russian/strings.xml --- xbmc-10.00~svn33778/language/Russian/strings.xml 2010-09-07 19:46:21.000000000 +0000 +++ xbmc-10.00~svn34731/language/Russian/strings.xml 2010-09-16 15:58:13.000000000 +0000 @@ -1,9 +1,7 @@ - - - + Программы Фото @@ -165,6 +163,7 @@ Выберите фильм: Запрос информации от %s Загрузка данных о фильме + Вэб-интерфейс Девиз Сюжет Голосов: @@ -305,8 +304,8 @@ Черный экран Следы 'Матрицы' Включать заставку через - Режим заставки - Завершити роботу через + Заставка + Завершить работу через Все альбомы Свежие альбомы Заставка @@ -350,13 +349,13 @@ Единица измерения скорости ветра Погода Температура - Ощущается как + Ощущается Уровень УФ Ветер Точка росы Влажность - --> - , скорость: до + + По умолчанию Подключение к Гидрометеоцентру Получение прогноза для: @@ -366,6 +365,8 @@ Загрузка эскизов... Нет данных Вид: Значки крупн. + Мин. + Макс Удалить данные об альбоме Удалить данные о CD Выбор @@ -378,7 +379,7 @@ Не кэшировать Удалить фильм из медиатеки Действительно удалить '%s'? - От %s в %i %s + С %s на %i %s Съемный диск Открытие файла Буферизация @@ -878,7 +879,7 @@ Сменить защиту Защита источника Поле ввода пароля пусто. Повторите ввод. - Главная защита + Общая защита Выключить систему если количество неудачных попыток исчерпано Код защиты неправильный! Введите правильный код защиты! @@ -911,7 +912,7 @@ Выход Спящий режим Ждущий режим - Выход из + Выход Перезагрузка Свернуть Реакция на кнопку питания @@ -966,6 +967,8 @@ Запущен, сработает в %im НАПОМИНАНИЕ! Отменено за %im%is до срабатывания + %2.0fм + %2.0fс Искать субтитры в rar-архивах Укажите субтитры... Переместить объект @@ -1051,7 +1054,7 @@ Создавать эскизы Включить микрофон Включить устройство - Том + Громкость Основной режим просмотра Стандартная Яркость Стандартная Контрастность @@ -1090,7 +1093,7 @@ Настройки Last.fm Минимальная скорость вентиляторов Загрузка - Не показывать исполнителей, которые появляются только в сборниках + Не показывать исполнителей, в сборниках Метод обработки Автоопределение Основные шейдеры (ARB) @@ -1493,8 +1496,8 @@ Выключение через 30 мин. Выключение через 1 час Выключение через 2 часа - Особый таймер выключения - Отключить таймер выключения + Выключение через заданное время + Убрать таймер выключения Заблокировать предпочтения для %s Просмотр... Основная информация @@ -1860,8 +1863,9 @@ Обновлять медиатеку при запуске Всегда обновлять медиатеку в фоновом режиме - Суффикс DNS - Задержано на: %2.3fs - Опережает на: %2.3fs + %2.3fс + Задержано на: %2.3fс + Опережает на: %2.3fс Смещение субтитров Производитель OpenGL: Рендерер OpenGL: diff -Nru xbmc-10.00~svn33778/language/Spanish (Mexico)/strings.xml xbmc-10.00~svn34731/language/Spanish (Mexico)/strings.xml --- xbmc-10.00~svn33778/language/Spanish (Mexico)/strings.xml 2010-04-02 05:58:23.000000000 +0000 +++ xbmc-10.00~svn34731/language/Spanish (Mexico)/strings.xml 2010-09-20 15:44:51.000000000 +0000 @@ -1,9 +1,10 @@ - + + Programas Imágenes @@ -11,9 +12,11 @@ Vídeos Guía-TV Ajustes + XBMC SVN Administrador archivos Clima xbox media center + Lunes Martes Miércoles @@ -21,6 +24,7 @@ Viernes Sábado Domingo + Enero Febrero Marzo @@ -33,8 +37,48 @@ Octubre Noviembre Diciembre + + Lun + Mar + Mié + Jue + Vie + Sab + Dom + + Ene + Feb + Mar + Abr + May + Jun + Jul + Ago + Sep + Oct + Nov + Dic + + N + NNE + NE + ENE + E + ESE + SE + SSE + S + SSO + SO + OSO + O + ONO + NO + NNO + VAR + Ver: Auto - Ver: A. Grande + Ver: Auto Gr. Ver: Iconos Ver: Lista Analizar @@ -48,6 +92,8 @@ Crear miniaturas Accesos directos Pausado + Falló Actualiz. + Falló Instalac. Copiar Mover Eliminar @@ -100,13 +146,18 @@ Sin Disco Disco Presente Skin - Activar servidor FTP - Activar sincronización horaria desde Internet + + Resolución Ajustar frecuencia refresco + + Fecha de publicación + Mostrar videos 4:3 como + Estados de ánimo Estilos + Canción Duración Seleccionar álbum @@ -127,8 +178,11 @@ Seleccione película: Consultando %s Cargando detalles de la película + Interfaz Web + Eslogan Resumen + Votos: Reparto Argumento @@ -146,7 +200,7 @@ La red no está conectada Cancelar Velocidad - Tiempo de transición + Probar patrones... Consultar CDs de audio en Internet Lista de reproducción aleatoria al cargar @@ -161,13 +215,13 @@ Minimificación Magnificación Borrar lista de reproducción al finalizar - Reproducción automática de DVD Vídeo - Reproducción automática de VCD/SVCD - Reproducción automática de CD Audio - Reproducción automática de juegos Xbox - Reproducción automática de vídeos - Reproducción automática de música - Reproducción automática de imágenes + Display Mode + Pant. Completa #%d + En ventana + Tasa de Refresco + Pant. Completa + Tamaño: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixels: %2.2f:1) + Scripts Idioma Música @@ -206,7 +260,7 @@ encontrados %i elementos Resultados de la búsqueda No se encontraron resultados - Filtro de postprocesado + Subtítulos Tipografía Tamaño @@ -218,15 +272,19 @@ Borrar marcadores Retardo de sonido Marcadores + - receptor con AAC + - receptor con MP1 + - receptor con MP2 + - receptor con MP3 Retardo Idioma Activado No-Interpolado - - Postprocesado automático - - Filtro anti-cuadros vertical - - Filtro anti-cuadros horizontal - - Brillo/contraste automáticos - - Filtro anti-círculos + + + + + (0=auto) Limpieza de base de datos Preparando... @@ -254,13 +312,14 @@ Conversión de imágenes por segundo Salida de sonido Analógica - Digital + Optica/Coaxial Varios Intérpretes Reproduc. disco Películas Ajustar Imágenes/seg Actores Año + Realzar volumen al hacer downmix Programas Apagado Atenuar @@ -318,8 +377,8 @@ Viento Punto Rocío Humedad - De - a + + Predef. Accediendo a weather Obteniendo el tiempo para: @@ -328,8 +387,11 @@ No hay crítica para este álbum Descargando miniatura... No disponible - Ver: I. Grandes - Habilitar biblioteca + Ver: I. grandes + Min + Max + HDMI + Eliminar información del álbum Eliminar información CDDB Seleccionar @@ -342,6 +404,8 @@ Sin Caché Eliminar película de la base de datos ¿Eliminar realmente '%s'? + Del %s a %i %s + Disco Removible Abriendo fichero Cache @@ -385,6 +449,7 @@ Apariencia Opciones de Sonido Acerca de XBMC + Eliminar álbum Repetir Repetir Uno @@ -412,11 +477,11 @@ Pantalla principal Ajustes manuales Género - Obviar archivos comprimidos con un único fichero + Álbumes reproducidos recientemente Lanzar Lanzar en.. - Editar título XBE + Compilaciones Eliminar fuente Cambiar medio @@ -445,6 +510,7 @@ Dispositivo de salida passthrough No hay biografía para este artista Canal de bajada a stereo + Ordenar por: %s Nombre Fecha @@ -469,6 +535,9 @@ Por defecto Estudio Ruta + Pais + En progreso + Dirección de ordenación Método de ordenación Modo de vista @@ -487,17 +556,20 @@ Repetir: Off Repetir: Uno Repetir: Todos + Ripear CD de Audio Media Estándar Extrema Velocidad de bits constante (CBR) Ripeando... + A: No se puede copiar CD o Pista CDDARipPath no está definido. Copiar pista de audio Introducir número + Ripear CD Codificador Calidad @@ -534,26 +606,31 @@ Buscar lista de reproducción Buscar carpeta Info. de la Canción + Estiramiento No-lineal + Amplificación de Volumen Escoja la carpeta de exportación Éste archivo ya no está disponible ¿Le gustaría eliminarlo de la biblioteca? + Buscar Script + Nivel de compresión + Limpiar la biblioteca Eliminando canciones antiguas de la biblioteca Esta ruta ya ha sido explorada anteriormente Red - Anfitrión del proxy HTTP - Puerto del proxy HTTP - Activar proxy HTTP - Usuario Proxy HTTP - Contraseña Proxy HTTP + - Servidor + + Usar servidor proxy para acceder a internet + Protololo Internet (IP) Puerto especificado no válido. El valor debe estar entre 1 y 65535. Proxy HTTP - Asignación + + - Asignación Automática (DHCP) Manual (Estática) - Por defecto (Dashboard) + - Dirección IP - Máscara de Subred - Puerta de Enlace @@ -587,10 +664,12 @@ Añadir fuente ¿Está seguro? Eliminando fuente + Añadir Enlace a Programa Editar Ruta Programa Editar Nombre Programa Editar Profundidad Ruta + Ver: Lista Grande Amarillo Blanco @@ -598,12 +677,12 @@ Verde Claro Verde amarillento Verde azulado - Reservedo - Reservedo - Reservedo - Reservedo + Reservado + Reservado + + Error %i: recurso no disponible - - Auto Limitador FATX + Hardware Sonido Buscando Carpeta de diapositivas @@ -622,19 +701,26 @@ Interfaz deshabilitada La interfaz de red se deshabilitó con éxito. Nombre de la red inalámbrica (ESSID) - Eventos remotos - Activar eventos remotos + + Permitir que programas en este sistema manejen a XBMC Puerto Rango de puertos de eventos remotos - Recibir eventos de otros ordenadores + Permitir que programas en otro sistema manejen a XBMC Retraso inicial de repetición (ms) Retraso continuo de repetición (ms) Número máximo de clientes - Vista previa del salvapantallas + Accesso a Internet + + Se ingresó un número de puerto inválido + El rango válido de puerto es 1-65535 + El rango válido de puerto es 1024-65535 + + -Vista previa Imposible conectar XBMC ha sido incapaz de conectar a la dirección de red. Podría ser debido a que la red no esté conectada. ¿Desea añadirla de todos modos? + Dirección IP Añadir Dirección de Red Protocolo @@ -666,24 +752,30 @@ Submenú Habilitar Botones de Submenú Favoritos - Plugins Vídeo - Plugins Música - Plugins Imágenes + Addons de Vídeo + Addons de Música + Addons de Imágenes Cargando carpeta %i elementos obtenidos %i de %i elementos obtenidos - Plugins Aplicaciones + Addons de Aplicaciones Establecer miniatura de plugin Configuración del plugin Puntos de acceso Otro... - Usuario de Servidor Web + Nombre de usuario + Configuración de Script + Simples + Ingrese dir. web + Cliente SMB Grupo de trabajo Usuario por defecto Contraseña por defecto + Servidor WINS Montar recursos compartidos SMB + Eliminar Música Vídeo @@ -708,17 +800,25 @@ Programas, video y música Programas, imágenes y música Programas, imágenes y video - Usuario FTP - Contraseña FTP - Usuario y contraseña establecidos exitosamente + + + + + Autodetección Autodetección de otros sistemas Nickname + Preguntar antes de conectar Enviar usuario y contraseña FTP Intervalo de Ping ¿Desea conectar al sistema autodetectado? + Zeroconf publishing + + Dispositivo de audio especial + Dispositivo passthrough especial + A la deriva y Helando @@ -737,12 +837,31 @@ con viento llovizna - T-Storm + Tormenta Eléctrica Llovizna - Nublado + Brumoso Granos + T. Eléctricas + Tormentas + Moderado + Muy Alta + Ventoso + Niebla + + + + Apagar pantalla cuando esté desocupado + + Duración: - Tipo de LCD + + Falló script : %s + Se necesita nueva versión - Vea log + + + + activar LCD/VFD + Inicio Programas Imágenes @@ -765,15 +884,19 @@ Configuración - Apariencia Scripts Navegador Web + Vídeos/Lista de reproducción Configuración->Perfiles + Cuadro de diálogo Sí/No Diálogo de Progreso + Buscando subtítulos... Cacheando subtítulos... finalizando buffering Abriendo flujo + Música/Lista de reproducción Música/Archivos Música/Biblioteca @@ -786,11 +909,14 @@ Juego en Red Extensiones Info Sistema + Música - Biblioteca Música - Reproduciendo + Vídeo - Reproduciendo Información de álbum Información de película + Diálogo de Selección Música/info Diálogo de OK @@ -798,23 +924,24 @@ Secuencias de Comandos/Info Vídeo a pantalla completa Visualización de sonido + Diálogo de agrupar archivos Reconstruir índice... Volver a Ventana Música Volver a Ventana Vídeos - Actualizar lista de trainers - Entrenador - No se encontraron trainers - Configuración de trainers - Faltan todos los trailers registrados. Actualice su lista - Continuar automáticamente desde la última posición - No - Si - Preguntar + + + + + + + + + Comenzar desde el principio Continuar desde la posición %s - Validando trainers existentes... - Generar miniaturas para vídeos sin carátula + + 0 1 2 @@ -864,21 +991,25 @@ Esto eliminará cualquier valor previamente salvado Mostrar cada imagen durante Usar efectos de movimiento y ampliación - Reproducir vídeos NTSC con ratios PAL - Reproducir vídeos PAL con ratios NTSC - Reproducir vídeos NTSC en PAL60 + + + Reloj de 12 horas Reloj de 24 horas Día/Mes Mes/Día + Encendido hace Minutos Horas Días Tiempo total encendido + El Tiempo + Salvapantallas OSD a pantalla completa + Sistema Parar el disco duro inmediatamente Sólo Vídeo @@ -894,12 +1025,17 @@ Salir Reiniciar Minimizar + Acción del boton de Encendido + Existe otra sesión activa, ¿tal vez ssh? Disco duro remoto montado Expulsión de dispositivo no segura Dispositivo eliminado correctamente Joystick conectado Joystick desconectado + + Se está quedando sin batería + Filtro antivibración Permitir al dispositivo elegir (requiere reinicio) Sinc. de refresco vertical @@ -909,50 +1045,62 @@ Probar resolución ¿Guardar resolución? ¿Desea mantener esta resolución? + Reescalado software de alta calidad Deshabilitado Habilitado para contenido en baja definición Siempre habilitado + Método de reescalado Bicúbico Lanczos Sinc - Enlace Pixmap-Textura estricto (requiere reinicio) + VDPAU + Nivel de reescalado HQ VDPAU + Conversión de color VDPAU con calidad de estudio + Mostrar refresco Deshabilitado Pantallas de refresco + Conexiones activas detectadas! Si continúa, puede que pierda el control de XBMC ¿Está seguro de que quiere parar el servidor de eventos?? + ¿Cambiar modo Apple remoto Si está usando Apple Remote para controlar XBMC, cambiar éste ajuste puede afectar su capacidad para continuar controlándolo.¿Desea continuar? - Clave del HDD: - Temperatura del HDD: - Modelo del DVD: - Firmware del DVD: - Modelo del HDD: - Numero de serie del HDD: - Firmware del HDD : - Contraseña del HDD: - Estado del bloqueo del HDD: + + + + + + + + + + Máscara de red Puerta de enlace DNS Primario Fallo en inicialización - Gampepad - Teclado - Ratón - Auricular/micrófono - MemoryStick - Mando a distancia - Puerto del controlador + + + + + + + + + + Nunca Inmediatamente Después de %i segs. Fecha de instalación del disco duro: Contador de encendidos del disco duro: + Perfiles ¿Eliminar el perfil '%s'? Último perfil cargado: @@ -963,13 +1111,18 @@ Iniciada, alarma en %im ¡Alarma! Cancelada antes de %im%is + %2.0fm + %2.0fs + Buscar subtítulos en RARs Buscar subtítulos... Mover Elemento Mover Elemento Aquí Cancelar Movimiento + Hardware: Uso de CPU: + Conectado, pero no hay un DNS disponible. Disco duro DVD-ROM @@ -978,23 +1131,23 @@ Red de trabajo Vídeo Hardware - _ + Sistema operativo: Velocidad de CPU: - BIOS detectada: + Codificador de Vídeo: Resolución de pantalla: - Version de Xbox: - Numero de serie de Xbox: - Fabricante de Xbox: - ModChip: + + + + Cable A/V: - Región de vídeo y XBE: + Región de DVD: Internet: Conectado No conectado. Compruebe la configuración de red. - Clave de Xbox Live: + Temperatura deseada Velocidad del ventilador Control del ventilador por temperatura @@ -1033,8 +1186,8 @@ Editar etiqueta Crear por defecto Quitar botón - LED frontal - Color del LED frontal + + Dejarlo tal cual Verde Naranja @@ -1071,10 +1224,8 @@ Usar Búsqueda basada en tiempo Plantilla de nombres de pistas correcta Ajustes Predeterminados - No hay ajustes predet. -disponibles para esta visualización - No hay ajustes disponibles -para esta visualización + No hay ajustes predet. disponibles para esta visualización + No hay ajustes disponibles para esta visualización Expulsar/Cargar Usar visualización mientras se reproduce sonido Calcular Tamaño @@ -1096,7 +1247,7 @@ Top 250 Sintonizar en Last.FM Velocidad mínima de ventilador - - Los feeds RSS contienen texto de derecha a izquierda + Descargando Ocultar artistas que sólo aparecen en compilaciones Método de renderizado @@ -1106,22 +1257,55 @@ Software Expulsar VDPAU + Comenzar presentación aquí + Recordar para esta carpeta + Usar objetos de buffer de pixel + Permitir aceleración por HW (VDPAU) + Permitir aceleración por HW (VAAPI) + Permitir aceleración por HW (DXVA2) + Permitir aceleración por HW (CrystalHD) + Permitir aceleración por HW (VDADecoder) + Permitir aceleración por HW (OpenMax) + Pixel Shaders + + Método de sincron. de A/V + Clock de audio + Clock de video(Drop/Dupe audio) + Clock de video (Re-muestreo de audio) + Re-muestreo máximo (%) + Calidad de Re-muestreo + Baja(rápido) + Media + Alta + Realmente alta(lento!) + Sincronizar reproducción con la pantalla + + Pausar durante cambio de velocidad de refresco + Apagado + %.1f Segundo + %.1f Segundos + Apple Remote - Modo - Siempre ejecutandose + + Permitir arrancar XBMC desde remoto Retraso en tiempo de secuencia + Deshabilitado Estándar Universal Remote + Multi Remote (Harmony) + Error de Apple Remote No se puede activar el soporte para Apple Remote. + Agrupar - No Agrupar + Desagrupar Descargando fichero de lista de reproducción... Descargando lista de canales... Procesando lista de canales... Descarga de lista de canales fallida Descarga del fichero de lista de reproducción fallida + Carpeta de Juegos Cambiar autom. a miniaturas según Activar cambio auto. a miniaturas @@ -1147,12 +1331,13 @@ - Internet Caché de DVD - DVD-ROM - Red Local - Servidores - Apariencia + Servicios + Configuración de red cambiada XBMC necesita reiniciar para poder cambiar su configuración de red. ¿Quiere reiniciar ahora? - Postprocesado + + - Apagar mientras está reproduciendo %i min %i seg @@ -1164,7 +1349,7 @@ Formato de Hora Formato de Fecha Filtros GUI - Activar búsquedas en Internet + Realizar la exploración en segundo plano Detener la exploración No es posible mientras se explora la información de medios @@ -1182,6 +1367,7 @@ ¿Quiere aplicar las opciones ahora? Aplicar cambios ahora Permitir el renombrado y borrado de archivos + Establecer Zona Horaria Usar Horario de Verano Añadir a favoritos @@ -1189,22 +1375,42 @@ - Colores País del huso horario Huso horario + Listas de archivos + Mostrar informacion EXIF de imágenes + Usar ventana de pantalla completa en vez de pantalla completa real + Encolar camciones al seleccionar + Reproducir CD de audio automáticamente + Reproducir + DVDs + Reproducir DVDs automaticamente + Tipografía de subtitulos + Internacional + Juego de carácteres + Debugging + Seguridad + Dispositivos de entrada + Ahorro de energía + Eliminar Juegos + Añadir + Contraseña + Biblioteca Base de datos * Todos Albums * Todos Artistas * Todas Canciones * Todos Géneros - Recordar el último fichero seleccionado + Almacenando... Sonidos de navegación Según skin Tema del skin Tema por defecto + Last.FM Enviar canciones a Last.FM Usuario Last.FM @@ -1222,6 +1428,12 @@ Usar sincronización A/V suavizada Ocultar nombres de fichero en vista de miniaturas Reproducir en modo fiesta + Enviar canciones a Libre.fm + Nombre de usuario de Libre.fm + Contraseña de Libre.fm + Libre.fm + Envío de canciones + Enviar datos de radio Last.FM a Last.FM Conectando a Last.FM... Seleccionando emisora... @@ -1271,17 +1483,21 @@ Quitar prohibición ¿Desea quitar esta pista de sus canciones favoritas? ¿Desea quitar la prohibición de esta pista? + Ruta no encontrada o inválida Imposible conectar al servidor No se encontraron servidores Grupo de trabajo no encontrado + Abriendo marcador multi-carpeta Ruta: + General - Configurar el hardware de sonido... - Consulta CDDB + + Búsqueda en internet Reproductor Reproducir desde disco + Introduzca nuevo título Introduzca el nombre de la Pelicula Introduzca el nombre del Perfil @@ -1303,23 +1519,26 @@ Reproducción de lista abortada Demasiados elementos fallidos consecutivos Introducir valor + Verifique los detalles en el archivo log. Modo fiesta abortado. No hay canciones coincidentes en la base de datos. No se pudo inicializar la base de datos. No se pudo abrir la base de datos. No se pudieron obtener canciones de la base de datos. Lista de reproducción del modo fiesta + Todos los vídeos Los no vistos Los ya vistos Marcar como vistos Marcar como no vistos Editar título - Usar NTSC-M y NTSC-J - Usar sólo NTSC-M - Usar sólo NTSC-J - Usar sólo PAL-60 - Para juegos a 60hz + + + + + + Operación abortada Fallo al copiar Fallo al copiar al menos un fichero @@ -1327,6 +1546,7 @@ Fallo al mover al menos un fichero Fallo al borrar Fallo al borrar al menos un fichero + Método de escalado de vídeo Vecino más cercano Bilinear @@ -1342,17 +1562,32 @@ (VDPAU)Reducción de Ruído (VDPAU)Agudeza Telecine inverso + Lanczos3 optimizado + Auto + Temporal (medio) + Temporal/Espacial (medio) + DXVA + + Post-procesado + + + + Mostrar cuenta atrás para el reposo + + Cambiar a canal + Carpeta de grabación de CDs de audio Usar Reproductor DVD externo Reproductor DVD externo Carpeta de trainers Carpeta de instantáneas - Carpeta de grabaciones + Carpeta de listas de reproducción Grabaciones Instantáneas Usar XBMC + Listas Rep. Música Listas Rep. Vídeo ¿Desea ejecutar el juego? @@ -1362,10 +1597,17 @@ Miniatura local Sin miniatura Elija miniatura + + + Conflicto Explorar nuevos Explorar todo Región + + + + Summario Bloquear sección de música Bloquear sección de vídeo Bloquear sección de imágenes @@ -1384,6 +1626,7 @@ Falta modo maestro Se entró en modo maestro Miniatura allmusic.com + Eliminar miniatura Añadir Perfil... Obtener información para todos los álbumes @@ -1513,48 +1756,61 @@ Rotar usando información EXIF Usar vista de poster para programas de TV Espere, por favor - Leyendo valores de la EEPROM - Lectura de la EEPROM realizada + + Permitir desplazamiento automático para el argumento y la reseña Personalizado Habilitar trazas de depuración - Obtener información de álbum cuando sea añadido - Obtener información de artista cuando sea añadido - Scraper por defecto + Descargar información adicional durante la actualización + Servicio para informacion de album + Servicio para informacion de artista Cambiar scraper Exportar biblioteca de música Importar biblioteca de música ¡No se encontraron artistas! Falló la descarga de información de artista + + + ¡Que empiece la fiesta! (vídeos) Mezclando bebidas (vídeos) Llenando vasos (vídeos) + Servidor WebDAV (HTTP) + Servidor WebDAV (HTTPS) + Primer login, cargue su perfil + Cliente HTS Tvheadend + Cliente VDR Streamdev + Carpeta Servidor Web (HTTP) Carpeta Servidor Web (HTTPS) - Desconocido. Por favor añada la firma MD5 de xbmc.log a BiosIDs.ini + Imposible escribir en carpeta: + Desea saltear y continuar? + RSS Feed + + DNS Secundario Servidor DHCP: Crear nueva carpeta Atenuar LCD al reproducir Desconocido o en placa (protegido) Atenuar LCD al pausar - Encender LED al pausar + Mi Vídeo - Biblioteca - Mis partidas guardadas + Por: ID - Descargar Partidas - Guardar Juego Instalado en el HDD - Fallo al Descargar Partida Guardada - Seleccione Partida Guardada para Descargar e Instalar - No se ha encontrado partida guardada en Internet para el juego especificado - Ir a Partida Guardada - Partidas Guardadas + + + + + + + Reproducir fragmento... Reiniciar Calibrado Esto reiniciará los valores de calibración de %s a sus valores por defecto. una ubicación para copiar la partida - una ubicación para mover la partida + Usar nombres de dir. en búsquedas Fichero ¿Usar nombres de archivo o carpeta en búsquedas? @@ -1601,6 +1857,7 @@ Temporada Descargando información de vídeo Desasignar contenido + Título original Actualizar información del programa de TV ¿Actualizar información de todos los episodios? El dir. contiene una única serie de TV @@ -1628,6 +1885,7 @@ Reproducir videoclip Obtener automáticamente las miniaturas de actor Establecer Miniatura de Actor + Eliminar marcador de episodio Establecer marcador de episodio Configuración del scraper @@ -1642,11 +1900,11 @@ Emisión Escritor Limpiar nombres de fichero - Agrupar series de TV duplicadas - nunca - si hay sólo una temporada - siempre - tiene trailer + + Nunca + Si hay sólo una temporada + Siempre + Tiene trailer Falso Presentación de fanart Exportar a un sólo archivo o separar @@ -1656,7 +1914,31 @@ ¿Exportar miniaturas y fanart? ¿Sobreescribir archivos antiguos? Excluir ruta de actualizaciones de biblioteca + Extraer información de miniaturas y video + Sets + Set movieset thumb + Exportar miniaturas de actores? + Elegir fanart + Fanart local + Sin fanart + Fanart actual + Fanart remoto + Cambiar contenido + Desea actualizar la información de todos + los items dentro desta carpeta? + Fanart + Se encontró información almacenada localmente. + Ignorar y actualizar desde intenet? + No se pudo descargar información + No se pudo conectar al servidor remoto + Desea continuar buscando? + Paises + episodio + episodios + + Mostrar archivos y carpetas ocultos + Cliente TuxBox ¡AVISO: El dispositivo TuxBox está en Modo-Grabación! El medio se detendrá! @@ -1664,18 +1946,16 @@ ¿Seguro que desea iniciar el medio? Conectando a: %s Dispositivo TuxBox - Música UPnP - Vídeo UPnP - Imágenes UPnP + + Añadir Compartición - Habilitar Servidor UPnP - Gestionar Compartidos UPnP de Música - Gestionar Compartidos UPnP de Vídeo - Gestionar Compartidos UPnP de Imágenes + Compartir librerias de video y música via UPnP + Editar Compartición Eliminar Compartición - Carpeta de subtítulos personalizado + Carpeta de subtítulos Carpeta de subtítulos de películas y otros + Habilitar ratón Reproducir sonidos de navegación durante reproducción Miniatura @@ -1724,6 +2004,9 @@ Scraper de serie por defecto Scraper de vídeo musical por defecto Habilitar vuelta atrás basada en lenguaje de Scraper + - Configuración + Multilingüe + No hay scrapers presentes Valor a encontrar Regla de lista de reproducción inteligente Encontrar canciones donde @@ -1747,6 +2030,18 @@ Carpeta de inicio Veces visto Título del episodio + Resolución de video + Canales de audio + Códec de video + Códec de audio + Lenguaje del audio + Lenguaje del subtítulo + El control remoto se comporta como un teclado + - Editar + Se requiere una conexión a internet. + Obtener más... + Sistema de archivos Root + Nombre de fichero Ruta de fichero Tamaño de fichero @@ -1756,6 +2051,7 @@ Comentario Color/BN Procesado JPEG + Fecha/Hora Descripción Fabricante de cámara @@ -1780,6 +2076,7 @@ Longitud GPS Altitud GPS Orientación + Categorías complementarias Palabras clave Pie de foto @@ -1821,13 +2118,17 @@ Años activo Firma Nacido/Formado + + + Actualizar biblioteca en el arranque Siempre actualizar la biblioteca en segundo plano - Sufijo DNS - Habilitar la edición y las listas de decisión + + %2.3fs Retrasado en: %2.3fs Adelantado en: %2.3fs - Retraso de subtitulos + Retraso de subtítulos Distribuidor OpenGL: Renderizador OpenGL: Versión OpenGL: @@ -1842,6 +2143,12 @@ Canales en vivo Grabaciones por título Guía + Error de aspecto permitido para minimizar bandas negras + Mostrar archivos de video en listados + Distribuidor DirectX: + Versión Direct3D: + + Fuente - Tamaño - Colores @@ -1856,7 +2163,198 @@ Blanco/Rojo Blanco/Azul Blanco/Negro + + Acción del botón select + Elegir + Mostrar información + Más... + Reproducir todo + + Teletext no disponible + Activar Teletext + Parte %i + Almacenando %i bytes + Deteniendo + Ejecutando + + + Reproductor externo activo + Click en OK para terminar el reproductor + + Click en OK cuando haya terminado la reproducción + + + Add-on + Add-ons + Opciones de Add-on + Información de Add-on + + Fuente de contenidos + Movie information + Screensaver + Script + Visualization + Add-on repository + Subtitles + Lyrics + TV information + Music video information + Album information + Artist information + + Configure + Disable + Enable + Add-on disabled + Weather + Weather.com (standard) + This Add-on can not be configured + Error loading settings + All Add-ons + Get Add-ons + Check for updates + Force refresh + Change log + Uninstall + Install + Disabled Add-ons + (Clear the current setting) + Install from zip file + Downloading %i%% + Available Updates + + Available Add-ons + Version: + Disclaimer + License: + Changelog + Desea activar este Add-on? + Desea desactivar este Add-on? + Hay disponible una actualización del Add-on! + Add-ons activados + Actualización automática + Add-on activado + Add-on Actualizado + Cancelar descarga de Add-on? + Add-ons siendo descargados + Actualización disponible + Actualizar + + No se pudo cargar el Add-on. + Ocurrió un error desconocido. + Se requiere configuración + No se pudo conectar + Es necesario reiniciar + Desactivar + Intentar reconectar? + Se reinicia Add-on + Bloquear administrador de Add-on + + + + + + + + El Add-on ha sido marcado como ROTO en el repositorio. + Desea desactivarlo en su sistema? + ROTO + + Modo biblioteca Teclado QWERTY - Aplicar ajustes del filtro de parpadeo a los juegos - \ No newline at end of file + Audio Passthrough en uso + + + + + + + + Calidad del Trailer + Stream + Descargar + Descargar y reproducir + Descargar y guardar + Hoy + Mañana + Guardando + Copiando + Establecer directorio de descargas + Duración de búsqueda + Corto + Largo + Usar reproductor de DVD en vez del reproductor regular + Preguntar por descarga antes de reproducir video + Clips + Reiniciar plugin para activar + Esta noche + Mañana en la noche + Condición + Precipitación + Precip + Humedo + Feels + Observada + Alejamiento del promedio + Amanece + Puesta + Detalles + Outlook + Coverflow + Traducir texto + Map list %s category + 36 Horas + Mapas + Hourly + Fin de semana + %s días + Alerta + Alertas + Elija su + Check + Configure el + Temporadas + Use su + Observe su + Escuche a + Mire su + Configure el + Power + Menu + Reproducir el + Opciones + Editor + Acerca de su + Star rating + Background + Backgrounds + Custom background + Custom backgrounds + Ver Leáme + Ver Changelog + Esta version de %s requiere + XBMC revision %s o superior para funcionar. + Por favor actualice XBMC. + No se encontraron datos! + Próx página + Amor + Odio + Este archivo esta apilado, seleccion la parte desde la que desea reproducir. + Ruta al script + Activar boton script personalizado + + Configuracion de parlantes + 2.0 + 2.1 + 3.0 + 3.1 + 4.0 + 4.1 + 5.0 + 5.1 + 7.0 + 7.1 + + + diff -Nru xbmc-10.00~svn33778/language/Swedish/strings.xml xbmc-10.00~svn34731/language/Swedish/strings.xml --- xbmc-10.00~svn33778/language/Swedish/strings.xml 2010-05-04 21:54:30.000000000 +0000 +++ xbmc-10.00~svn34731/language/Swedish/strings.xml 2010-09-17 15:26:05.000000000 +0000 @@ -1,20 +1,19 @@ - - - - - + + + + + Program Bilder Musik - Video + Videor TV-guide Inställningar Filhanterare Väder - xbmc media center Måndag Tisdag Onsdag @@ -53,6 +52,23 @@ Okt Nov Dec + N + NNÖ + NÖ + ÖNÖ + Ö + ÖSÖ + SÖ + SSÖ + S + SSV + SV + VSV + V + VNV + NV + NNV + VAR Vy: Auto Vy: Auto stor Vy: Ikoner @@ -110,7 +126,7 @@ Lagring Enhet Ledigt - Grafik + Video Ledigt minne Inget nätverk Ledigt @@ -123,7 +139,6 @@ Aktivera FTP-server Upplösning Justera uppdateringsfrekvens till att matcha video - Sträck 4:3 innehåll till 16:9 Utgivningsdatum Visa 4:3 filmer som Sinnesstämning @@ -148,6 +163,7 @@ Välj film: Hämtar info för %s Laddar filmdetaljer + Webgränssnitt Slogan Handling Röster: @@ -181,6 +197,12 @@ Förminskning Förstoring Rensa efter spellistans slut + Displayläge + Fullskärm #%d + Fönster + Uppdateringsfrekvens + Fullskärm + Storlek: (%i,%i)->(%i,%i) (Zoom x%2.2f) AR:%2.2f:1 (Pixlar: %2.2f:1) Skript Språk Musik @@ -219,7 +241,6 @@ Hittade %i objekt Sökresultat Inga resultat hittades - Efterbehandlingsfilter Undertexter Typsnitt - Storlek @@ -239,11 +260,6 @@ Språk Aktiverad Icke-interfolierad - - Automatisk efterbehandling - - Vertikalt deblockingfilter - - Horisontellt deblockingfilter - - Automatisk ljus/kontrast - - Dering (0 = auto) Rensar databas Förbereder... @@ -271,7 +287,7 @@ Justera bildfrekvens Ljudutgång Analog - Digital + Optisk/Koaxial Blandade artister Spela skiva Filmer @@ -336,8 +352,6 @@ Vind Daggpunkt Fuktighet - Från - vid Standard Kontaktar väderservice Hämtar väder för: @@ -349,6 +363,7 @@ Vy: Stora ikoner Låg Hög + HDMI Radera albuminfo Radera CD-information Välj @@ -361,6 +376,7 @@ Ingen buffert Radera filmen från biblioteket Är du säker på att ta bort '%s'? + Från %s vidd %i %s Löstagbar disk Öppnar fil Buffert @@ -434,7 +450,6 @@ Senast spelade album Starta Starta i... - Redigera XBE-titel Kompileringar Ta bort källa Byt media @@ -487,6 +502,8 @@ Standard Studio Sökväg + Land + Pågår Sorteringsriktning Sorteringsmetod Visningsläge @@ -526,7 +543,7 @@ Normal Zoom Sträck 4:3 - Sträck 14:9 + Bred zoom Sträck 16:9 Originalstorlek Anpassad storlek @@ -558,6 +575,7 @@ Denna fil är inte tillgänglig längre. Vill du ta bort den från biblioteket? Bläddra efter skript + Kompressionsnivå Rensar bibliotek Raderar gamla låtar från databasen Denna sökväg har skannats tidigare @@ -570,7 +588,6 @@ - Tilldelning Automatisk (DHCP) Manuell (Statisk) - Standard (Menysystem) - IP-adress - Nätmask - Standardgateway @@ -646,7 +663,7 @@ Ogiltigt portnummer angivet Giltigt portintervall är 1-65535 Giltigt portintervall är 1024-65535 - Förhandsgranska skärmsläckare + - Förhandsgranska Kunde inte ansluta XBMC kunde inte ansluta till nätverksplatsen. Detta kan bero på att nätverket inte är anslutet. @@ -727,9 +744,6 @@ Program & Video & Musik Program & Bilder & Musik Program & Bilder & Video - FTP-användarnamn - FTP-lösenord - Lösenordet sparades Autodetektering Autodetektera system Smeknamn @@ -763,9 +777,14 @@ Grynigt Åskstorm Åskskurar + Moderat + Väldigt hög + Blåsigt + Dimma Slå av bildskärm vid inaktivitet Speltid Skript misslyckades! : %s + Nyare version behövs - Se loggen Aktivera LCD/VFD Hem Program @@ -826,18 +845,8 @@ Återuppbygg index... Återgå till Musik Återgå till Filmer - Uppdatera hjälpprogram - Hjälpprogram - Inga hjälpprogram hittade - Inställningar för hjälpprogram - Alla registrerade hjälpprogram saknas. Uppdatera din lista - Återuppta från senaste position - Nej - Ja - Fråga Starta från början Återuppta från %s - Validerar existerande tränare... 0 1 2 @@ -887,9 +896,6 @@ Detta tar bort alla tidigare sparade värden Tid att visa varje bild Använd pan- och zoomeffekter - Spela NTSC-filmer i PAL - Spela PAL-filmer i NTSC - Spela NTSC-filmer i PAL60 12-timmarsklocka 24-timmarsklocka Dag/Månad @@ -908,8 +914,6 @@ - Fördröjning - Minimal speltid Stäng av - Menysystem - Använd anpassad sökväg till menysystem Avstängningsfunktion Avsluta Viloläge @@ -924,6 +928,7 @@ Borttagning av enhet lyckades Joystick ansluten Joystick borttagen + Batteriet börjar ta slut Flimmerfilter Låt drivrutinen välja (kräver omstart) Vertikal blankningssynk @@ -954,26 +959,10 @@ Om du för närvarande använder Apple-fjärr för att kontrollera XBMC, ändra denna inställning kan påverka din möjlighet för fortsatt kontroll av XBMC. Vill du fortsätta? - HDD-nyckel: - HDD-temp: - DVD-modell: - DVD-firmware: - HDD-modell: - HDD-serienummer: - HDD-firmware: - HDD-lösenord: - HDD-låsstatus: Nätmask Gateway Primär DNS Initialisering misslyckades - Spelkontroller - Tangentbord - Mus - Headset/Mikrofon - Minneskort - Fjärrkontroll - Kontrolluttag Aldrig Omedelbart Efter %i sek @@ -989,6 +978,8 @@ Startad, alarm om %im Alarm! Avbruten med %im%is kvar + %2.0fm + %2.0fs Sök efter undertexter i rar-filer Bläddra efter undertext... Flytta objekt @@ -1002,24 +993,17 @@ Lagring Standard Nätverk - Grafik + Video Hårdvara Operativsystem: CPU-hastighet: - Igenkänt BIOS: - Grafikchip: + Video-kodare: Skärmupplösning: - Xbox-version: - Xbox-serienummer: - Xbox-tillverkare: - Modchipp: A/V-kabel: - Film & XBE-region: DVD-region: Internet: Ansluten Inte uppkopplad. Kontrollera nätverksinställningar. - Xbox Live-nyckel: Måltemperatur Fläktfart Automatisk tempkontroll @@ -1058,8 +1042,6 @@ Ändra namn Ange som standard Ta bort knapp - Front-LED - Front-LED-färg Låt vara Grön Orange @@ -1096,8 +1078,10 @@ Använd tidsbaserad sökning Mall för spårnamn - höger sida Förinställning - Det finns inga förinställningar för den här visualiseringen - Det finns inga inställningar för den här visualiseringen + Det finns inga förinställningar +för den här visualiseringen + Det finns inga inställningar för +den här visualiseringen Mata ut/Mata in Använd visualisering under musikuppspelning Beräkna storlek @@ -1136,6 +1120,8 @@ Tillåt hårdvaruacceleration (DXVA2) Tillåt hårdvaruacceleration (CrystalHD) Tillåt hårdvaruacceleration (VDADecoder) + Tillåt hårdvaruacceleration (OpenMax) + Pixelskuggning A/V-synkmetod Ljudklocka Videoklocka (tappat/dubblerat ljud) @@ -1192,7 +1178,6 @@ Nätverksinställningar ändrade XBMC måste startas om för att slutföra din nätverksinställning. Vill du starta om nu? - Efterbehandling - Stäng av under uppspelning %i min %i sek @@ -1373,11 +1358,6 @@ Markera som visad Markera som inte visad Ändra titel - Använd NTSC-M & NTSC-J - Använd endast NTSC-M - Använd endast NTSC-J - Använd endast PAL-60 - För 60Hz-spel Operationen blev avbruten Kopieringen misslyckades Misslyckades kopiera minst en fil @@ -1404,6 +1384,8 @@ Auto Temporal (Halv) Temporal/Spatial (Halv) + DXVA + Efterbearbetning Visa insommningstimeout Byt till kanal Mapp för sparad musik @@ -1576,13 +1558,12 @@ Vrid som angivet i EXIF-information Använd postervisning för TV-serier Var god vänta - Tar backup av EEPROM - Tar backup av BIOS Aktivera automatisk rullning för handling & recension Anpassad Aktivera debugloggning Hämta tilläggsinformation under uppdateringar - Standardskrapa för musikinformation + Standardservice för albuminformation + Standardservice för artistinformation Byt skrapa Exportera musikbibliotek Importera musikbibliotek @@ -1594,29 +1575,21 @@ WebDAV-server (HTTP) WebDAV-server (HTTPS) Första inloggningen, ändra din profil + HTS Tvheadend-klient + VDR Streamdev-klient Webserver katalog (HTTP) Webserver katalog (HTTPS) Kunde inte skriva till mapp: Vill du hoppa över och fortsätta? RSS-flöde - Okänd. Lägg till MD5 från xbmc.log till BiosIDs.ini. Sekundär DNS DHCP-server: Skapa ny mapp Tona ned LCD under uppspelning Okänd eller inbyggd (skyddad) Tona ned LCD under paus - Slå på LED under paus Filmer - Bibliotek - Sparade spel Sort: ID - Ladda ned sparade spel - Sparat spel installerat på HDD - Misslyckades ladda ned sparat spel - Välj sparat spel att ladda ned och installera - Inga online-sparade spel hittades för det specifika spelet - Gå till Sparade spel - Sparade Spel Spela del... Kalibreringsåterställning Detta kommer att återställa kalibreringsvärden för %s @@ -1668,6 +1641,7 @@ Säsong Hämtar filminformation Oassocierat innehåll + Originaltitel Uppdatera TV-serieinformation Uppdatera alla avsnitt? Mappen innehåller en enda TV-serie @@ -1725,7 +1699,7 @@ Hämta miniatyrer och filminformation Uppsättningar Ange filmuppsättningsminiatyr - Exportera skådespelarminiatyrer + Exportera skådespelarminiatyrer? Välj fanart Lokal fanart Ingen fanart @@ -1738,8 +1712,11 @@ Lokalt lagrad information hittad. Ignorera och uppdatera från Internet? Kunde inte ladda ner information - Servern är troligtvis inte tillgänglig. + Kunde inte ansluta till fjärrserver Vill du fortsätta skanna? + Länder + avsnitt + avsnitt Visa dolda filer och mappar TuxBox-klient VARNING: Vald TuxBox-enhet är i inspelningsläge! @@ -1820,7 +1797,7 @@ Redigera smart spellista Namn på spellista Hitta objekt som matchar - - Redigera + Redigera %i låtar Ny smart spellista... %c disk @@ -1836,6 +1813,9 @@ Undertextsspråk Fjärrkontroll sänder tangentbordstryckningar - Redigera + Internetuppkoppling krävs. + Få mer... + Rotfilsystem Filnamn Filsökväg Filstorlek @@ -1911,8 +1891,9 @@ Etikett Född/bildat Uppdatera biblioteket vid uppstart - Uppdatera alltid biblioteket i bakgrunden + Dölj framsteg för biblioteksuppdateringar - DNS-suffix + %2.3fs Fördröjd med: %2.3fs Förväg med: %2.3fs Undertextkompensering @@ -1948,9 +1929,12 @@ vit/röd vit/blå svart/vit - Teletext ej tillgänglig - Vädertillägg - - Tilläggsinställningar + Standardaktion för val + Välj + Visa information + Mer... + Spela alla + Teletext inte tillgänglig Aktivera teletext Del %i Buffrar %i bytes @@ -1961,35 +1945,71 @@ Klicka OK när uppspelningen har slutat Tillägg Tillägg - Plugin - Skrapa + Tilläggsval + Tilläggsinformation + Mediakällor + Filminformation Skärmsläckare Skript Visualisering - Konfigurera Tillägg - Avaktivera Tillägg - Aktivera Tillägg - Tillägg avaktiverat - Vädersevice + Tilläggsförråd + Undertexter + Sångtexter + TV-information + Musikvideoinformation + Albuminformation + Artistinformation + Konfigurera + Inaktivera + Aktivera + Tillägg inaktiverat + Väder Weather.com (standard) Detta tillägg kan ej konfigureras Laddning av inställningar misslyckades - Tillgängliga Tillägg + Alla tillägg + Hämta tillägg + Kontrollera uppdateringar + Tvinga uppdatering + Ändringslogg + Avinstallera + Installera + Inaktiverat tillägg + (Rensa nuvarande inställning) + Installera från zipfil + Laddar ner %i%% + Tillgängliga uppdateringar + Tillgängliga Ttillägg Version: + Ansvarsfriskrivning Licens: - Vill du installera detta Tillägg? - Tillägget kan ej användas - Ett okänd fel har uppstått + Ändringslogg + Vill du aktivera detta tillägg? + Vill du inaktivera detta tillägg? + Tilläggsuppdatering tillgänglig! + Aktivera tillägg + Autouppdatering + Tillägg aktiverat + Tillägg uppdaterat + Avbryt tilläggsnedladdning? + Laddar ner tillägg nu + Uppdatering tillgänglig + Uppdatera + Tillägget kunde inte laddas. + Ett okänt fel har uppstått Krav på inställningar Kan ej ansluta Kräver omstart + Inaktivera Prova återanslut? - Tillägg startar om - Lås Tilläggshanteraren + Tillägget startar om + Lås tilläggshanteraren + Tillägget har markerats som trasigt i förrådet. + Vill du inaktivera det på ditt system? + Trasigt Biblioteksläge QWERTY-tangentbord Ljudgenomströmning används - Aktivera fladderfilterinställning till spel Söklängd Trailerkvalitet Strömma @@ -2065,7 +2085,9 @@ Lame Vorbis Wav - DXVA + DXVA2 + VAAPI + Flac Högtalarkonfiguration 2.0 2.1 @@ -2077,4 +2099,4 @@ 5.1 7.0 7.1 - + \ No newline at end of file diff -Nru xbmc-10.00~svn33778/language/Turkish/strings.xml xbmc-10.00~svn34731/language/Turkish/strings.xml --- xbmc-10.00~svn33778/language/Turkish/strings.xml 2010-07-21 15:21:49.000000000 +0000 +++ xbmc-10.00~svn34731/language/Turkish/strings.xml 2010-09-28 13:49:00.000000000 +0000 @@ -4,8 +4,8 @@ - - + + Programlar Resimler @@ -59,6 +59,24 @@ Eki Kas Ara + + K + KKD + KD + DKD + D + DGD + GD + GGD + G + GGB + GB + BGB + B + BKB + KB + KKB + VAR Görünüm: Otomatik Görünüm: Otomatik büyük @@ -75,7 +93,8 @@ Küçük resim oluştur Kısayollar Duraklatıldı - + Güncelleme başarısız + Yükleme başarısız Kopyala Taşı Sil @@ -160,6 +179,7 @@ Film seç: %s bilgisi sorgulanıyor Film ayrıntıları yükleniyor + Web arabirimi Hakkında İçerik @@ -200,6 +220,8 @@ Tam Ekran #%d Pencere Yenileme Hızı + Tam ekran + Boyutlandırma: (%i,%i)->(%i,%i) (Yakınlaştırma x%2.2f) AR:%2.2f:1 (Pikseller: %2.2f:1) Betikler Dil @@ -383,6 +405,7 @@ Önbellek yok Filmi kitaplıktan kaldır '%s' gerçekten kaldırılsın mı? + %s yönünden %i %s Çıkartılabilir disk Dosya açılıyor @@ -813,7 +836,7 @@ Kristal Ilık ile - rüzgârlı + rüzgarlı çiseleyen Gök gürültülü sağanak Çiseleyen @@ -822,6 +845,9 @@ T-Storms T-Showers Hafif + Çok Yüksek + Rüzgarlı + Sisli @@ -1001,6 +1027,7 @@ Yeniden Başlat Simge Durumuna Güç düğmesi eylemi + Sistemi Kapatma Düşük pil ile çalışıyor @@ -1086,6 +1113,8 @@ Alarm Aktif: %idk Alarm! %idk:%isn kala iptal edildi + %2.0fm + %2.0fs Altyazıları sıkıştırılmış klasörlerde ara Altyazıya gözat... @@ -1253,6 +1282,11 @@ Gerçekten yüksek(yavaş!) Oynatımı görüntüye senkronla + Yenileme hızını değiştirirken duraklat + Kapalı + %.1f Saniye + %.1f Saniye + Apple kumanda XBMC'nin kumandayı kullanarak başlamasına izin ver @@ -1536,10 +1570,10 @@ Temporal/Spatial (Yarım) DXVA - Video post-processing - Devre dışı - SD içeriği için etkin - Her zaman etkin + Post-processing + + + Görüntü uyku zaman aşımı @@ -2093,6 +2127,7 @@ Kitaplık güncellemelerinin ilerleme durumunu gizle - DNS soneki + %2.3fs Geriye :% 2.3fs İleriye: %2.3fs Altyazı gecikmesi @@ -2248,7 +2283,7 @@ Kaydediliyor Kopyalanıyor İndirme klasörünü ayarla - Arama süresi + Arama süresi Kısa Uzun Herzamanki oynatıcı yerine DVD oynatıcıyı kullan diff -Nru xbmc-10.00~svn33778/lib/libmodplug/libmodplug_2008.vcproj xbmc-10.00~svn34731/lib/libmodplug/libmodplug_2008.vcproj --- xbmc-10.00~svn33778/lib/libmodplug/libmodplug_2008.vcproj 2010-05-17 18:25:38.000000000 +0000 +++ xbmc-10.00~svn34731/lib/libmodplug/libmodplug_2008.vcproj 2010-10-04 05:04:04.000000000 +0000 @@ -1,7 +1,7 @@ + + diff -Nru xbmc-10.00~svn33778/lib/libmodplug/libmodplug_2010.vcxproj xbmc-10.00~svn34731/lib/libmodplug/libmodplug_2010.vcxproj --- xbmc-10.00~svn33778/lib/libmodplug/libmodplug_2010.vcxproj 2010-05-18 08:22:01.000000000 +0000 +++ xbmc-10.00~svn34731/lib/libmodplug/libmodplug_2010.vcxproj 2010-10-04 05:04:04.000000000 +0000 @@ -64,6 +64,8 @@ $(OutDir)$(TargetName)$(TargetExt) + true + libmodplug.def copy "$(TargetPath)" "$(SolutionDir)..\..\system\players\paplayer\$(TargetFileName)" @@ -85,6 +87,7 @@ $(OutDir)$(TargetName)$(TargetExt) + libmodplug.def copy "$(TargetPath)" "$(SolutionDir)..\..\system\players\paplayer\$(TargetFileName)" @@ -131,6 +134,9 @@ + + + diff -Nru xbmc-10.00~svn33778/lib/libmodplug/libmodplug.def xbmc-10.00~svn34731/lib/libmodplug/libmodplug.def --- xbmc-10.00~svn33778/lib/libmodplug/libmodplug.def 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/lib/libmodplug/libmodplug.def 2010-10-04 05:04:04.000000000 +0000 @@ -0,0 +1,11 @@ +LIBRARY libmodplug.dll +EXPORTS + +ModPlug_Load +ModPlug_Unload +ModPlug_Read +ModPlug_GetName +ModPlug_GetLength +ModPlug_Seek +ModPlug_GetSettings +ModPlug_SetSettings diff -Nru xbmc-10.00~svn33778/lib/pcre/libpcre/libpcre.vcproj xbmc-10.00~svn34731/lib/pcre/libpcre/libpcre.vcproj --- xbmc-10.00~svn33778/lib/pcre/libpcre/libpcre.vcproj 2010-05-17 18:25:38.000000000 +0000 +++ xbmc-10.00~svn34731/lib/pcre/libpcre/libpcre.vcproj 2010-09-30 07:19:56.000000000 +0000 @@ -1,7 +1,7 @@ Disabled .;..\;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + NO_RECURSE;WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -69,7 +69,7 @@ true false .;..\;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + NO_RECURSE;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded true diff -Nru xbmc-10.00~svn33778/lib/pcre/pcre_exec.c xbmc-10.00~svn34731/lib/pcre/pcre_exec.c --- xbmc-10.00~svn33778/lib/pcre/pcre_exec.c 2009-12-15 20:13:52.000000000 +0000 +++ xbmc-10.00~svn34731/lib/pcre/pcre_exec.c 2010-09-30 07:19:56.000000000 +0000 @@ -283,7 +283,7 @@ #define RMATCH(ra,rb,rc,rd,re,rf,rg,rw)\ {\ - heapframe *newframe = (pcre_stack_malloc)(sizeof(heapframe));\ + heapframe *newframe = (heapframe*)(pcre_stack_malloc)(sizeof(heapframe));\ frame->Xwhere = rw; \ newframe->Xeptr = ra;\ newframe->Xecode = rb;\ @@ -472,7 +472,7 @@ heap whenever RMATCH() does a "recursion". See the macro definitions above. */ #ifdef NO_RECURSE -heapframe *frame = (pcre_stack_malloc)(sizeof(heapframe)); +heapframe *frame = (heapframe*)(pcre_stack_malloc)(sizeof(heapframe)); frame->Xprevframe = NULL; /* Marks the top level */ /* Copy in the original argument variables */ diff -Nru xbmc-10.00~svn33778/Makefile.in xbmc-10.00~svn34731/Makefile.in --- xbmc-10.00~svn33778/Makefile.in 2010-09-10 06:41:33.000000000 +0000 +++ xbmc-10.00~svn34731/Makefile.in 2010-10-11 09:46:03.000000000 +0000 @@ -71,7 +71,6 @@ xbmc/cores/paplayer/NSFCodec \ xbmc/cores/paplayer/timidity \ xbmc/cores/paplayer/SIDCodec \ - xbmc/cores/paplayer/GYMCodec \ xbmc/cores/paplayer/YMCodec/StSoundLibrary \ xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU \ xbmc/cores/paplayer/vgmstream \ @@ -120,13 +119,17 @@ VIS_DIRS+=xbmc/visualizations/Goom endif + CONFLUENCE_MEDIA=addons/skin.confluence/media SKIN_DIRS=\ $(CONFLUENCE_MEDIA) +LIVE_DIRS=\ + tools/XBMCLive + DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \ - $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(SKIN_DIRS) + $(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(SKIN_DIRS) $(LIVE_DIRS) LIBS=@LIBS@ CFLAGS=@CFLAGS@ @@ -353,7 +356,6 @@ ifeq ($(findstring osx,$(ARCH)), osx) $(MAKE) -C xbmc/cores/paplayer/FLACCodec endif - $(MAKE) -C xbmc/cores/paplayer/GYMCodec $(MAKE) -C xbmc/cores/paplayer/vgmstream $(MAKE) -C xbmc/cores/paplayer/timidity $(MAKE) -C xbmc/cores/paplayer/NSFCodec @@ -501,6 +503,9 @@ tools/TexturePacker/TexturePacker: guilib/guilib.a xbmc/lib/libsquish/libsquish-@ARCH@.a $(MAKE) -C tools/TexturePacker/ +livedatas: + $(MAKE) -C tools/XBMCLive + install-bin: xbmc.bin # developement convenience target sudo install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc @@ -543,8 +548,8 @@ @install -D -m 0644 media/icon.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png @test -z "$(DESTDIR)" && gtk-update-icon-cache -f -q -t $(datadir)/icons/hicolor || : -install-livedatas: - @echo "Install Live CD datas in $(DESTDIR)$(prefix) ..." +install-livedatas: livedatas + @echo "Install Live CD datas..." @mkdir -p $(DESTDIR)$(bindir) @install -D tools/XBMCLive/diskmounter $(DESTDIR)$(bindir)/diskmounter @install -D tools/XBMCLive/installXBMC $(DESTDIR)$(bindir)/installXBMC diff -Nru xbmc-10.00~svn33778/project/BuildDependencies/scripts/libcurl_d.bat xbmc-10.00~svn34731/project/BuildDependencies/scripts/libcurl_d.bat --- xbmc-10.00~svn33778/project/BuildDependencies/scripts/libcurl_d.bat 2010-07-19 17:54:54.000000000 +0000 +++ xbmc-10.00~svn34731/project/BuildDependencies/scripts/libcurl_d.bat 2010-09-23 07:27:11.000000000 +0000 @@ -7,7 +7,7 @@ cd %TMP_PATH% -xcopy curl-7.21.0-devel-mingw32\include\curl "%CUR_PATH%\include\curl" /E /Q /I /Y -copy curl-7.21.0-devel-mingw32\bin\*.dll "%XBMC_PATH%\system\" /Y +xcopy curl-7.21.1-devel-mingw32\include\curl "%CUR_PATH%\include\curl" /E /Q /I /Y +copy curl-7.21.1-devel-mingw32\bin\*.dll "%XBMC_PATH%\system\" /Y cd %LOC_PATH% diff -Nru xbmc-10.00~svn33778/project/BuildDependencies/scripts/libcurl_d.txt xbmc-10.00~svn34731/project/BuildDependencies/scripts/libcurl_d.txt --- xbmc-10.00~svn33778/project/BuildDependencies/scripts/libcurl_d.txt 2010-07-19 17:54:54.000000000 +0000 +++ xbmc-10.00~svn34731/project/BuildDependencies/scripts/libcurl_d.txt 2010-09-23 07:27:11.000000000 +0000 @@ -1,2 +1,2 @@ ; filename source of the file -curl-7.21.0-devel-mingw32.zip http://www.gknw.de/mirror/curl/win32/ +curl-7.21.1-devel-mingw32.zip http://www.gknw.de/mirror/curl/win32/ diff -Nru xbmc-10.00~svn33778/project/VS2008Express/XBMC for Windows.sln xbmc-10.00~svn34731/project/VS2008Express/XBMC for Windows.sln --- xbmc-10.00~svn33778/project/VS2008Express/XBMC for Windows.sln 2010-06-27 19:41:55.000000000 +0000 +++ xbmc-10.00~svn34731/project/VS2008Express/XBMC for Windows.sln 2010-10-04 04:55:08.000000000 +0000 @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 +# Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XBMC", "XBMC.vcproj", "{3A68081D-E8F9-4523-9436-530DE9E5530A}" ProjectSection(ProjectDependencies) = postProject {00700E12-A63B-4E54-B962-4011A90584BD} = {00700E12-A63B-4E54-B962-4011A90584BD} @@ -658,32 +658,32 @@ {324F66C2-44D0-4D50-B979-F9DAE7FD36DB}.Release (OpenGL)|Win32.Build.0 = Release|Win32 {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Debug (DirectX)|Win32.ActiveCfg = Release|Win32 {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Debug (DirectX)|Win32.Build.0 = Release|Win32 - {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32 - {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32 + {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Debug (OpenGL)|Win32.ActiveCfg = Release|Win32 + {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Debug (OpenGL)|Win32.Build.0 = Release|Win32 {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Release (DirectX)|Win32.ActiveCfg = Release|Win32 {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Release (DirectX)|Win32.Build.0 = Release|Win32 {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32 {7E551393-3C43-47F8-9F3F-5BC368A6C487}.Release (OpenGL)|Win32.Build.0 = Release|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug (DirectX)|Win32.ActiveCfg = Release|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug (DirectX)|Win32.Build.0 = Release|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32 - {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug (OpenGL)|Win32.ActiveCfg = Release|Win32 + {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Debug (OpenGL)|Win32.Build.0 = Release|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release (DirectX)|Win32.ActiveCfg = Release|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release (DirectX)|Win32.Build.0 = Release|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32 {97239A56-DBC0-41D2-BC14-C87D9B97D63B}.Release (OpenGL)|Win32.Build.0 = Release|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug (DirectX)|Win32.ActiveCfg = Release|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug (DirectX)|Win32.Build.0 = Release|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32 - {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug (OpenGL)|Win32.ActiveCfg = Release|Win32 + {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Debug (OpenGL)|Win32.Build.0 = Release|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release (DirectX)|Win32.ActiveCfg = Release|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release (DirectX)|Win32.Build.0 = Release|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release (OpenGL)|Win32.ActiveCfg = Release|Win32 {FA5FC7EB-C72F-415F-AE42-91DD605ABDDA}.Release (OpenGL)|Win32.Build.0 = Release|Win32 {62C61EDD-FDC6-4F2C-9ED6-0FEC3C07D616}.Debug (DirectX)|Win32.ActiveCfg = Release|Win32 {62C61EDD-FDC6-4F2C-9ED6-0FEC3C07D616}.Debug (DirectX)|Win32.Build.0 = Release|Win32 - {62C61EDD-FDC6-4F2C-9ED6-0FEC3C07D616}.Debug (OpenGL)|Win32.ActiveCfg = Debug|Win32 - {62C61EDD-FDC6-4F2C-9ED6-0FEC3C07D616}.Debug (OpenGL)|Win32.Build.0 = Debug|Win32 + {62C61EDD-FDC6-4F2C-9ED6-0FEC3C07D616}.Debug (OpenGL)|Win32.ActiveCfg = Release|Win32 + {62C61EDD-FDC6-4F2C-9ED6-0FEC3C07D616}.Debug (OpenGL)|Win32.Build.0 = Release|Win32 {62C61EDD-FDC6-4F2C-9ED6-0FEC3C07D616}.Release (DirectX)|Win32.ActiveCfg = Release|Win32 {62C61EDD-FDC6-4F2C-9ED6-0FEC3C07D616}.Release (DirectX)|Win32.Build.0 = Release|Win32 {62C61EDD-FDC6-4F2C-9ED6-0FEC3C07D616}.Release (OpenGL)|Win32.ActiveCfg = ReleaseItanium|Win32 diff -Nru xbmc-10.00~svn33778/project/VS2008Express/XBMC.vcproj xbmc-10.00~svn34731/project/VS2008Express/XBMC.vcproj --- xbmc-10.00~svn33778/project/VS2008Express/XBMC.vcproj 2010-09-13 07:36:38.000000000 +0000 +++ xbmc-10.00~svn34731/project/VS2008Express/XBMC.vcproj 2010-10-06 06:37:08.000000000 +0000 @@ -1552,14 +1552,6 @@ > - - - - @@ -2516,14 +2508,6 @@ > - - - - diff -Nru xbmc-10.00~svn33778/project/VS2010Express/guilib.vcxproj xbmc-10.00~svn34731/project/VS2010Express/guilib.vcxproj --- xbmc-10.00~svn33778/project/VS2010Express/guilib.vcxproj 2010-06-17 23:45:25.000000000 +0000 +++ xbmc-10.00~svn34731/project/VS2010Express/guilib.vcxproj 2010-10-04 04:55:08.000000000 +0000 @@ -78,12 +78,14 @@ $(DXSDK_DIR)Lib\x86;$(LibraryPath) $(DXSDK_DIR)Include;$(IncludePath) $(DXSDK_DIR)Lib\x86;$(LibraryPath) + $(DXSDK_DIR)Include;$(IncludePath) + $(DXSDK_DIR)Include;$(IncludePath) /MP %(AdditionalOptions) Speed - ..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\lib\libSDL-WIN32\include;..\..\xbmc\Win32;..\..\xbmc\;..\..\lib\freetype\include;..\..\lib\freetype\include\freetype2;..\..\xbmc\lib\boost;..\..\guilib;..\..\xbmc\utils;..\..\guilib\common\;..\..\xbmc\lib\libglew\;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib\libmicrohttpd_win32\include;%(AdditionalIncludeDirectories) + ..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\xbmc\Win32;..\..\xbmc\;..\..\lib\freetype\include;..\..\lib\freetype\include\freetype2;..\..\xbmc\lib\boost;..\..\guilib;..\..\xbmc\utils;..\..\guilib\common\;..\..\xbmc\lib\libglew\;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib\libmicrohttpd_win32\include;..\..\ WIN32;NDEBUG;_LIB;_MSVC;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;%(PreprocessorDefinitions) false MultiThreaded @@ -172,7 +174,7 @@ Disabled - ..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\lib\libSDL-WIN32\include;..\..\xbmc\Win32;..\..\xbmc\;..\..\lib\freetype\include;..\..\lib\freetype\include\freetype2;..\..\xbmc\lib\boost;..\..\guilib;..\..\xbmc\utils;..\..\guilib\common\;..\..\xbmc\lib\libglew\;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib\libmicrohttpd_win32\include;%(AdditionalIncludeDirectories) + ..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\xbmc\Win32;..\..\xbmc\;..\..\lib\freetype\include;..\..\lib\freetype\include\freetype2;..\..\xbmc\lib\boost;..\..\guilib;..\..\xbmc\utils;..\..\guilib\common\;..\..\xbmc\lib\libglew\;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib\libmicrohttpd_win32\include;..\..\ WIN32;_DEBUG;_LIB;_MSVC;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;%(PreprocessorDefinitions) false true diff -Nru xbmc-10.00~svn33778/project/VS2010Express/UnrarXLib.vcxproj xbmc-10.00~svn34731/project/VS2010Express/UnrarXLib.vcxproj --- xbmc-10.00~svn33778/project/VS2010Express/UnrarXLib.vcxproj 2010-05-18 08:22:01.000000000 +0000 +++ xbmc-10.00~svn34731/project/VS2010Express/UnrarXLib.vcxproj 2010-10-04 04:55:08.000000000 +0000 @@ -82,6 +82,8 @@ UnrarXLib $(DXSDK_DIR)Include;$(IncludePath) $(DXSDK_DIR)Lib\x86;$(LibraryPath) + $(DXSDK_DIR)Include;$(IncludePath) + $(DXSDK_DIR)Include;$(IncludePath) @@ -103,7 +105,7 @@ 4800;4018;4146;4996;%(DisableSpecificWarnings) - $(OutDir)$(ProjectName).lib + $(TargetPath) @@ -172,7 +174,7 @@ 4800;4018;4146;4996;%(DisableSpecificWarnings) - $(OutDir)$(ProjectName).lib + $(TargetPath) diff -Nru xbmc-10.00~svn33778/project/VS2010Express/XBMC.vcxproj xbmc-10.00~svn34731/project/VS2010Express/XBMC.vcxproj --- xbmc-10.00~svn33778/project/VS2010Express/XBMC.vcxproj 2010-08-26 23:25:48.000000000 +0000 +++ xbmc-10.00~svn34731/project/VS2010Express/XBMC.vcxproj 2010-10-06 06:25:35.000000000 +0000 @@ -90,6 +90,10 @@ $(DXSDK_DIR)Lib\x86;$(LibraryPath) $(DXSDK_DIR)Include;$(IncludePath) $(DXSDK_DIR)Lib\x86;$(LibraryPath) + $(DXSDK_DIR)Include;$(IncludePath) + $(DXSDK_DIR)Include;$(IncludePath) + $(DXSDK_DIR)Lib\x86;$(LibraryPath) + $(DXSDK_DIR)Lib\x86;$(LibraryPath) @@ -98,7 +102,7 @@ Default Speed true - ..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\include;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\xbmc\cores;..\..\xbmc\;..\..\xbmc\utils;..\..\lib\libcurl-mingw32\include;..\..\guilib\;..\..\;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\xbmc\lib\libUPnP\Platinum\Source\Platinum;..\..\xbmc\lib\libUPnP\Platinum\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\System\Win32;..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay;..\..\xbmc\FileSystem;..\..\xbmc\lib\libRTMP;..\..\xbmc\lib\boost;..\..\lib\libSDL-WIN32\include;..\..\xbmc\lib\libPython\Python\PC;..\..\xbmc\lib\libsamplerate\src;..\..\xbmc\lib;..\..\lib\freetype\include;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\libmicrohttpd_win32\include;..\..\lib\libssh_win32\include;..\..\lib\liblame\include;..\..\lib\libbluray_win32;%(AdditionalIncludeDirectories) + ..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\include;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\xbmc\cores;..\..\xbmc\;..\..\xbmc\utils;..\..\guilib\;..\..\;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\xbmc\lib\libUPnP\Platinum\Source\Platinum;..\..\xbmc\lib\libUPnP\Platinum\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\System\Win32;..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay;..\..\xbmc\FileSystem;..\..\xbmc\lib\libRTMP;..\..\xbmc\lib\boost;..\..\xbmc\lib\libPython\Python\PC;..\..\xbmc\lib\libsamplerate\src;..\..\xbmc\lib;..\..\lib\freetype\include;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\libmicrohttpd_win32\include;..\..\lib\libssh_win32\include;..\..\lib\liblame\include;..\..\lib\libbluray_win32 _WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions) false false @@ -232,7 +236,7 @@ Disabled - ..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\include;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\xbmc\cores;..\..\xbmc\;..\..\xbmc\utils;..\..\lib\libcurl-mingw32\include;..\..\guilib\;..\..\;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\xbmc\lib\libUPnP\Platinum\Source\Platinum;..\..\xbmc\lib\libUPnP\Platinum\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\System\Win32;..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay;..\..\xbmc\FileSystem;..\..\xbmc\lib\libRTMP;..\..\xbmc\lib\boost;..\..\lib\libSDL-WIN32\include;..\..\xbmc\lib\libPython\Python\PC;..\..\xbmc\lib\libsamplerate\src;..\..\xbmc\lib;..\..\lib\freetype\include;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\libmicrohttpd_win32\include;..\..\lib\libssh_win32\include;..\..\lib\liblame\include;..\..\lib\libbluray_win32;%(AdditionalIncludeDirectories) + ..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg\include;..\..\xbmc\cores\dvdplayer\Codecs\ffmpeg;..\..\xbmc\cores;..\..\xbmc\;..\..\xbmc\utils;..\..\guilib\;..\..\;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\xbmc\lib\libUPnP\Platinum\Source\Platinum;..\..\xbmc\lib\libUPnP\Platinum\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\Core;..\..\xbmc\lib\libUPnP\Neptune\Source\System\Win32;..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay;..\..\xbmc\FileSystem;..\..\xbmc\lib\libRTMP;..\..\xbmc\lib\boost;..\..\xbmc\lib\libPython\Python\PC;..\..\xbmc\lib\libsamplerate\src;..\..\xbmc\lib;..\..\lib\freetype\include;..\..\lib\libiconv\include;..\..\lib\libcdio\include;..\..\lib;..\..\lib\jsoncpp\jsoncpp\include;..\..\lib\libmicrohttpd_win32\include;..\..\lib\libssh_win32\include;..\..\lib\liblame\include;..\..\lib\libbluray_win32 _WINDOWS;_MSVC;WIN32;_DEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;Py_NO_ENABLE_SHARED;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions) true Async @@ -249,7 +253,7 @@ /MACHINE:I386 /IGNORE:4089 /ignore:4254 %(AdditionalOptions) - SDL.lib;D3D9.lib;D3dx9.lib;DInput8.lib;DSound.lib;winmm.lib;ws2_32.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;%(AdditionalDependencies) + SDL.lib;D3D9.lib;D3DX9.lib;DInput8.lib;DSound.lib;winmm.lib;ws2_32.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;%(AdditionalDependencies) $(OutDir)XBMC.exe ..\..\lib\libSDL-WIN32\lib;%(AdditionalLibraryDirectories) libc;msvcrt;libcmt;%(IgnoreSpecificDefaultLibraries) @@ -291,6 +295,7 @@ + Create @@ -397,7 +402,6 @@ - @@ -527,7 +531,6 @@ - @@ -999,6 +1002,7 @@ + @@ -1145,7 +1149,6 @@ - @@ -1229,7 +1232,6 @@ - diff -Nru xbmc-10.00~svn33778/project/VS2010Express/XBMC.vcxproj.filters xbmc-10.00~svn34731/project/VS2010Express/XBMC.vcxproj.filters --- xbmc-10.00~svn33778/project/VS2010Express/XBMC.vcxproj.filters 2010-08-27 08:25:27.000000000 +0000 +++ xbmc-10.00~svn34731/project/VS2010Express/XBMC.vcxproj.filters 2010-09-23 06:27:29.000000000 +0000 @@ -2099,7 +2099,7 @@ Source Files\Utils - + cores\dvdplayer\DVDCodecs\Audio @@ -2110,6 +2110,9 @@ cores\dvdplayer\DVDInputStreams + + Source Files\Utils + @@ -4441,6 +4444,9 @@ cores\dvdplayer\DVDInputStreams + + Source Files\Utils + diff -Nru xbmc-10.00~svn33778/README.ubuntu xbmc-10.00~svn34731/README.ubuntu --- xbmc-10.00~svn33778/README.ubuntu 2010-08-13 23:36:03.000000000 +0000 +++ xbmc-10.00~svn34731/README.ubuntu 2010-10-06 02:50:10.000000000 +0000 @@ -90,6 +90,8 @@ Here is the magic command to get the build dependencies (used to compile the version on the PPA). # sudo apt-get build-dep xbmc +*** For Hardy add "deb http://ppa.launchpad.net/team-xbmc/xbmc-ppa-build-depends/ubuntu hardy main" to sources.list + *** Avoid using "aptitude" for the build-dep command. It doesn't resolve everything. *** For developers and anyone else who compiles frequently it is recommended to use ccache diff -Nru xbmc-10.00~svn33778/system/keymaps/gamepad.xml xbmc-10.00~svn34731/system/keymaps/gamepad.xml --- xbmc-10.00~svn33778/system/keymaps/gamepad.xml 2010-07-25 10:39:35.000000000 +0000 +++ xbmc-10.00~svn34731/system/keymaps/gamepad.xml 2010-09-15 10:19:15.000000000 +0000 @@ -347,6 +347,11 @@ Close + + + Close + + PreviousMenu diff -Nru xbmc-10.00~svn33778/system/keymaps/joystick.AppleRemote.xml xbmc-10.00~svn34731/system/keymaps/joystick.AppleRemote.xml --- xbmc-10.00~svn33778/system/keymaps/joystick.AppleRemote.xml 2010-07-25 10:39:35.000000000 +0000 +++ xbmc-10.00~svn34731/system/keymaps/joystick.AppleRemote.xml 2010-09-15 10:19:15.000000000 +0000 @@ -268,4 +268,9 @@ + + + + + diff -Nru xbmc-10.00~svn33778/system/keymaps/joystick.Harmony.xml xbmc-10.00~svn34731/system/keymaps/joystick.Harmony.xml --- xbmc-10.00~svn33778/system/keymaps/joystick.Harmony.xml 2010-07-25 10:39:35.000000000 +0000 +++ xbmc-10.00~svn34731/system/keymaps/joystick.Harmony.xml 2010-09-15 10:19:15.000000000 +0000 @@ -488,4 +488,9 @@ + + + + + diff -Nru xbmc-10.00~svn33778/system/keymaps/joystick.Logitech.RumblePad.2.xml xbmc-10.00~svn34731/system/keymaps/joystick.Logitech.RumblePad.2.xml --- xbmc-10.00~svn33778/system/keymaps/joystick.Logitech.RumblePad.2.xml 2010-07-25 10:39:35.000000000 +0000 +++ xbmc-10.00~svn34731/system/keymaps/joystick.Logitech.RumblePad.2.xml 2010-09-15 10:19:15.000000000 +0000 @@ -250,4 +250,10 @@ + + + + + + diff -Nru xbmc-10.00~svn33778/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml xbmc-10.00~svn34731/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml --- xbmc-10.00~svn33778/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml 2010-07-25 10:39:35.000000000 +0000 +++ xbmc-10.00~svn34731/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml 2010-09-15 10:19:15.000000000 +0000 @@ -314,6 +314,11 @@ + + + + + diff -Nru xbmc-10.00~svn33778/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml xbmc-10.00~svn34731/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml --- xbmc-10.00~svn33778/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml 2010-07-25 10:39:35.000000000 +0000 +++ xbmc-10.00~svn34731/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml 2010-09-15 10:19:15.000000000 +0000 @@ -416,6 +416,14 @@ + + + Mad Catz MicroCON + Logitech Xbox Cordless Controller + Microsoft X-Box pad (Japan) + + + Mad Catz MicroCON diff -Nru xbmc-10.00~svn33778/system/keymaps/joystick.PS3.Remote.Keyboard.xml xbmc-10.00~svn34731/system/keymaps/joystick.PS3.Remote.Keyboard.xml --- xbmc-10.00~svn33778/system/keymaps/joystick.PS3.Remote.Keyboard.xml 2010-07-25 10:39:35.000000000 +0000 +++ xbmc-10.00~svn34731/system/keymaps/joystick.PS3.Remote.Keyboard.xml 2010-09-15 10:19:15.000000000 +0000 @@ -186,6 +186,14 @@ + + + PS3 Remote Keyboard + MoSart PS3 Remote Keyboard + + + + PS3 Remote Keyboard diff -Nru xbmc-10.00~svn33778/system/keymaps/joystick.WiiRemote.xml xbmc-10.00~svn34731/system/keymaps/joystick.WiiRemote.xml --- xbmc-10.00~svn33778/system/keymaps/joystick.WiiRemote.xml 2010-09-07 09:47:58.000000000 +0000 +++ xbmc-10.00~svn34731/system/keymaps/joystick.WiiRemote.xml 2010-10-02 17:08:42.000000000 +0000 @@ -60,6 +60,7 @@ + @@ -284,4 +285,9 @@ + + + + + diff -Nru xbmc-10.00~svn33778/system/keymaps/keyboard.xml xbmc-10.00~svn34731/system/keymaps/keyboard.xml --- xbmc-10.00~svn33778/system/keymaps/keyboard.xml 2010-08-19 20:25:31.000000000 +0000 +++ xbmc-10.00~svn34731/system/keymaps/keyboard.xml 2010-10-06 10:07:35.000000000 +0000 @@ -106,8 +106,29 @@ Rewind SkipNext SkipPrevious + Info + VolumeUp + VolumeDown + Mute + OSD + ActivateWindow(music) + ActivateWindow(pictures) + ActivateWindow(video) + + Notification(MCEKeypress, Recorded TV, 3) + Notification(MCEKeypress, Live TV, 3) + Notification(MCEKeypress, My TV, 3) + Notification(MCEKeypress, Radio, 3) + Notification(MCEKeypress, DVD menu, 3) + Notification(MCEKeypress, DVD subtitle, 3) + Notification(MCEKeypress, DVD audio, 3) + + + XBMC.ShutDown() + + info @@ -187,7 +208,7 @@ Select Select - + FastForward @@ -196,6 +217,7 @@ Close CodecInfo Close + Close OSD @@ -320,6 +342,7 @@ Close Close Close + close Info CodecInfo @@ -485,6 +508,7 @@ Close Close + Close Close @@ -498,6 +522,11 @@ Close + + + Close + + Close @@ -515,6 +544,7 @@ NextPicture PreviousPicture Close + Close Close Close Pause diff -Nru xbmc-10.00~svn33778/system/keymaps/remote.xml xbmc-10.00~svn34731/system/keymaps/remote.xml --- xbmc-10.00~svn33778/system/keymaps/remote.xml 2010-08-21 10:00:46.000000000 +0000 +++ xbmc-10.00~svn34731/system/keymaps/remote.xml 2010-09-15 10:24:11.000000000 +0000 @@ -384,6 +384,11 @@ Close + + + Close + + PreviousMenu diff -Nru xbmc-10.00~svn33778/system/Lircmap.xml xbmc-10.00~svn34731/system/Lircmap.xml --- xbmc-10.00~svn33778/system/Lircmap.xml 2010-07-23 17:39:48.000000000 +0000 +++ xbmc-10.00~svn34731/system/Lircmap.xml 2010-10-06 21:10:38.000000000 +0000 @@ -364,6 +364,7 @@ + cx23885_remote KEY_LEFT KEY_RIGHT KEY_UP Binary files /tmp/JVsbOCf0M4/xbmc-10.00~svn33778/system/players/dvdplayer/avcodec-52.dll and /tmp/Ikn7IzWVLu/xbmc-10.00~svn34731/system/players/dvdplayer/avcodec-52.dll differ Binary files /tmp/JVsbOCf0M4/xbmc-10.00~svn33778/system/players/dvdplayer/avformat-52.dll and /tmp/Ikn7IzWVLu/xbmc-10.00~svn34731/system/players/dvdplayer/avformat-52.dll differ Binary files /tmp/JVsbOCf0M4/xbmc-10.00~svn33778/system/players/dvdplayer/avutil-50.dll and /tmp/Ikn7IzWVLu/xbmc-10.00~svn34731/system/players/dvdplayer/avutil-50.dll differ Binary files /tmp/JVsbOCf0M4/xbmc-10.00~svn33778/system/players/dvdplayer/postproc-51.dll and /tmp/Ikn7IzWVLu/xbmc-10.00~svn34731/system/players/dvdplayer/postproc-51.dll differ Binary files /tmp/JVsbOCf0M4/xbmc-10.00~svn33778/system/players/dvdplayer/swscale-0.6.1.dll and /tmp/Ikn7IzWVLu/xbmc-10.00~svn34731/system/players/dvdplayer/swscale-0.6.1.dll differ Binary files /tmp/JVsbOCf0M4/xbmc-10.00~svn33778/system/players/paplayer/gensapu.dll and /tmp/Ikn7IzWVLu/xbmc-10.00~svn34731/system/players/paplayer/gensapu.dll differ diff -Nru xbmc-10.00~svn33778/tools/EventClients/lib/c#/EventClient.cs xbmc-10.00~svn34731/tools/EventClients/lib/c#/EventClient.cs --- xbmc-10.00~svn33778/tools/EventClients/lib/c#/EventClient.cs 2010-05-15 22:50:38.000000000 +0000 +++ xbmc-10.00~svn34731/tools/EventClients/lib/c#/EventClient.cs 2010-10-06 02:08:55.000000000 +0000 @@ -118,7 +118,15 @@ if (socket != null) Disconnect(); uniqueToken = UID; socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); + +// For compilation with .net framework 1.0 or 1.1 +// define the FRAMEWORK_1_x conditional compilation constant in the project +// or add /define:FRAMEWORK_1_x to the csc.exe command line +#if FRAMEWORK_1_x socket.Connect(Dns.GetHostByName(Address).AddressList[0].ToString(), Port); +#else + socket.Connect(Address, Port); +#endif return true; } catch @@ -382,7 +390,7 @@ Flags |= ButtonFlagsType.BTN_USE_AMOUNT; } - if ((Flags & ButtonFlagsType.BTN_DOWN) == 0 || (Flags & ButtonFlagsType.BTN_UP) == 0) + if ((Flags & ButtonFlagsType.BTN_DOWN) == 0 && (Flags & ButtonFlagsType.BTN_UP) == 0) Flags |= ButtonFlagsType.BTN_DOWN; byte[] payload = new byte[Button.Length + DeviceMap.Length + 8]; diff -Nru xbmc-10.00~svn33778/tools/Linux/packaging/debian/control xbmc-10.00~svn34731/tools/Linux/packaging/debian/control --- xbmc-10.00~svn33778/tools/Linux/packaging/debian/control 2010-09-13 22:48:09.000000000 +0000 +++ xbmc-10.00~svn34731/tools/Linux/packaging/debian/control 2010-10-11 09:56:46.000000000 +0000 @@ -54,7 +54,7 @@ with using XBMC Media Center. Package: xbmc-live -Architecture: all +Architecture: any Depends: xbmc-standalone (= ${binary:Version}), policykit, openssh-server, @@ -64,6 +64,7 @@ sudo, whois, ${misc:Depends}, + ${shlibs:Depends}, Conflicts: kdm, gdm, xdm, wdm Description: XBMC Media Center (XBMC Live package) XBMC, recursive acronym for "XBMC Media Center", is an award winning free and diff -Nru xbmc-10.00~svn33778/tools/Linux/packaging/debian/control.in xbmc-10.00~svn34731/tools/Linux/packaging/debian/control.in --- xbmc-10.00~svn33778/tools/Linux/packaging/debian/control.in 2010-09-13 22:48:09.000000000 +0000 +++ xbmc-10.00~svn34731/tools/Linux/packaging/debian/control.in 2010-10-11 09:56:46.000000000 +0000 @@ -38,7 +38,7 @@ with using XBMC Media Center. Package: xbmc-live -Architecture: all +Architecture: any Depends: #XBMC_LIVE_DEPENDS# Conflicts: kdm, gdm, xdm, wdm Description: XBMC Media Center (XBMC Live package) diff -Nru xbmc-10.00~svn33778/tools/Linux/packaging/debian/rules xbmc-10.00~svn34731/tools/Linux/packaging/debian/rules --- xbmc-10.00~svn33778/tools/Linux/packaging/debian/rules 2010-08-26 06:02:54.000000000 +0000 +++ xbmc-10.00~svn34731/tools/Linux/packaging/debian/rules 2010-10-11 09:50:19.000000000 +0000 @@ -97,9 +97,13 @@ dh_install --sourcedir=$(CURDIR)/debian/tmp -XLICENCE \ -XLicence.txt -XLicense.txt -XLiberationSans-Regular.ttf \ -XDejaVuSans.ttf -XDejaVuSans-Bold.ttf - # Delete stuff in xbmc-data that is in other packages + # Delete stuff that is in other packages rm -rf debian/xbmc-data/usr/share/xbmc/addons/skin.* rm -rf debian/xbmc-data/usr/share/xbmc/web + # Add in live.d scripts to packaging + mkdir -p debian/xbmc-live/etc/xbmc + cp -rf tools/XBMCLive/live.d debian/xbmc-live/etc/xbmc + override_dh_strip: dh_strip --dbg-package=xbmc-dbg diff -Nru xbmc-10.00~svn33778/tools/Linux/packaging/debian/var_info xbmc-10.00~svn34731/tools/Linux/packaging/debian/var_info --- xbmc-10.00~svn33778/tools/Linux/packaging/debian/var_info 2010-08-27 10:50:40.000000000 +0000 +++ xbmc-10.00~svn34731/tools/Linux/packaging/debian/var_info 2010-10-11 09:56:46.000000000 +0000 @@ -42,7 +42,8 @@ adduser, sudo, whois, - \${misc:Depends}," + \${misc:Depends}, + \${shlibs:Depends}," if [ $(lsb_release -cs) = "karmic" ]; then XBMC_LIVE_DEPENDS="$XBMC_LIVE_DEPENDS devicekit-disks, diff -Nru xbmc-10.00~svn33778/tools/Linux/packaging/debian/xbmc-live.install xbmc-10.00~svn34731/tools/Linux/packaging/debian/xbmc-live.install --- xbmc-10.00~svn33778/tools/Linux/packaging/debian/xbmc-live.install 2010-08-02 01:33:13.000000000 +0000 +++ xbmc-10.00~svn34731/tools/Linux/packaging/debian/xbmc-live.install 2010-10-11 09:50:19.000000000 +0000 @@ -1,3 +1,4 @@ usr/bin/diskmounter usr/bin/runXBMC usr/bin/setAlsaVolumes + diff -Nru xbmc-10.00~svn33778/tools/Linux/packaging/debian/xbmc-live.postinst xbmc-10.00~svn34731/tools/Linux/packaging/debian/xbmc-live.postinst --- xbmc-10.00~svn33778/tools/Linux/packaging/debian/xbmc-live.postinst 2010-07-02 08:38:32.000000000 +0000 +++ xbmc-10.00~svn34731/tools/Linux/packaging/debian/xbmc-live.postinst 2010-10-11 15:30:24.000000000 +0000 @@ -192,6 +192,9 @@ fi done + if ! grep -i -q XBMCLive /etc/lsb-release ; then + sed -i -e "/^DISTRIB_DESCRIPTION/s/\"$.*$\"/\"\1 - XBMCLive Dharma\"/" /etc/lsb-release + fi # Add to grub's kernel entries if [ -f /boot/grub/menu.lst ]; then diff -Nru xbmc-10.00~svn33778/tools/Linux/packaging/debian/xbmc-live.upstart xbmc-10.00~svn34731/tools/Linux/packaging/debian/xbmc-live.upstart --- xbmc-10.00~svn33778/tools/Linux/packaging/debian/xbmc-live.upstart 2010-08-12 14:44:09.000000000 +0000 +++ xbmc-10.00~svn34731/tools/Linux/packaging/debian/xbmc-live.upstart 2010-10-11 10:00:19.000000000 +0000 @@ -32,6 +32,8 @@ echo "$@" | cut -d "=" -f 2 } + clear >/dev/tty7 || true + CMDLINE=$(cat /proc/cmdline) #Process command line options @@ -45,84 +47,34 @@ done echo $XBMC_PARAMS > /tmp/xbmcliveParams - # Relies on init scripts to mount boot device on a specified directory - # TODO hardcode the already mounted directories (speed) - # XBMC Live V2 - BOOTMEDIADIRECTORY="image" - BOOTMEDIAMOUNTPOINT="$(mount | grep $BOOTMEDIADIRECTORY | cut -f 3 -d ' ')" - if [ ! -n "$BOOTMEDIAMOUNTPOINT" ]; then - # XBMC Live V1 - BOOTMEDIADIRECTORY="bootMedia" - BOOTMEDIAMOUNTPOINT="$(mount | grep $BOOTMEDIADIRECTORY | cut -f 3 -d ' ')" - fi - - # Executes hooks (if any) in the "Hooks" directory - for hook in $(ls -1 $BOOTMEDIAMOUNTPOINT/Hooks/*.sh) - do - sh $hook - done - - - # Identify Ubuntu release - LSBRELEASE="$(lsb_release -r | cut -f2 | sed 's/\.//')" - - # Identify GPU, Intel by default - GPUTYPE="INTEL" - - GPU=$(lspci -nn | grep 0300) - # 10de == NVIDIA - if [ "$(echo $GPU | grep 10de)" ]; then - GPUTYPE="NVIDIA" - else - # 1002 == AMD - if [ "$(echo $GPU | grep 1002)" ]; then - GPUTYPE="AMD" - fi - fi - - # Generates valid xorg.conf for proprietary drivers if missing - if [ ! -e /etc/X11/xorg.conf ] && ! grep -q -i nogenxconf /tmp/xbmcliveParams ; then - if [ "$GPUTYPE" = "NVIDIA" ]; then - if [ $LSBRELEASE -gt 910 ]; then - # only on lucid! - update-alternatives --set gl_conf /usr/lib/nvidia-current/ld.so.conf - ldconfig - fi - - # run nvidia-xconfig - /usr/bin/nvidia-xconfig -s --no-logo --no-composite --no-dynamic-twinview --force-generate - - # Disable scaling to make sure the gpu does not loose performance - sed -i -e 's%Section \"Screen\"%&\n Option \"FlatPanelProperties\" \"Scaling = Native\"\n Option \"HWCursor\" \"Off\"%' /etc/X11/xorg.conf - fi - if [ "$GPUTYPE" = "AMD" ]; then - if [ $LSBRELEASE -gt 910 ]; then - # only on lucid! - update-alternatives --set gl_conf /usr/lib/fglrx/ld.so.conf - ldconfig - fi - - # run aticonfig - /usr/bin/aticonfig --initial --sync-vsync=on -f - fi - fi - - if [ ! "$(mount | grep iso9660)" ]; then - if ! grep -q -i noredir /tmp/xbmcliveParams ; then - if [ -n "$BOOTMEDIAMOUNTPOINT" ]; then - if [ ! -d $BOOTMEDIAMOUNTPOINT/dotXBMC ]; then - mkdir $BOOTMEDIAMOUNTPOINT/dotXBMC - fi - if [ -d /home/xbmc/.xbmc ]; then - if [ -L /home/xbmc/.xbmc ]; then - rm /home/xbmc/.xbmc - else - mv /home/xbmc/.xbmc /home/xbmc/.xbmc.previous - fi - fi - ln -s $BOOTMEDIAMOUNTPOINT/dotXBMC /home/xbmc/.xbmc - fi - fi + if grep "boot=live" /proc/cmdline ; then + # Relies on init scripts to mount boot device on a specified directory + BOOTMEDIAMOUNTPOINT="/live/image" + fi + + BOOTHOOKSDIRECTORY="/etc/xbmc" + + xbmcUser=xbmc + # Read configuration variable file if it is present + [ -r /etc/default/xbmc-live ] && . /etc/default/xbmc-live + if ! getent passwd $xbmcUser >/dev/null; then + xbmcUser=$(getent passwd 1000 | sed -e 's/\:.*//') + fi + + # Executes pre-hooks (if any) in the System "Hooks" directory + if [ -d $BOOTHOOKSDIRECTORY/live.d ]; then + for hook in $(find $BOOTHOOKSDIRECTORY/live.d -type f -perm /u=x,g=x,o=x | sort) + do + $hook $BOOTMEDIAMOUNTPOINT $XBMC_PARAMS + done + fi + + # Executes pre-hooks (if any) in the user "Hooks" directory + if [ -d /home/$xbmcUser/.xbmc/live.d ]; then + for hook in $(find /home/$xbmcUser/.xbmc/live.d -type f -perm /u=x,g=x,o=x | sort) + do + $hook $BOOTMEDIAMOUNTPOINT $XBMC_PARAMS + done fi if [ -f /home/xbmc/.xsession ] ; then @@ -141,83 +93,6 @@ exec /usr/bin/runXBMC end script -post-start script - findUSBPort() { - local FD=7 - local tmpFile=$(mktemp) - local eof=0 - local line - local usbPort="" - local pciDevice="" - local inBlock="0" - local token=$1 - - lshal > $tmpFile - - # Open files. - eval exec "$FD<$tmpFile" - - while [ $eof -eq 0 ] - do - if read line <&$FD; then - if [ -n "$(echo $line | grep -i $token)" ]; then - if [ "$inBlock" = "0" ]; then - inBlock="1" - token="linux.sysfs_path" - else - pciDevice=$(echo $line | awk -F/ '{ print $5}') - eof=1 - fi - fi - else - eof=1 - fi - done - - if [ -n "$pciDevice" ] ; then - usbPort=$(cat /proc/acpi/wakeup | grep $pciDevice | awk '{ print $1}') - fi - - echo $usbPort - } - - - if grep -q -i setvolume /tmp/xbmcliveParams ; then - /usr/bin/setAlsaVolumes - fi - - if ! grep -q -i nodiskmount /tmp/xbmcliveParams ; then - /usr/bin/diskmounter - fi - - if grep -q -i wakeOnUSBRemote /tmp/xbmcliveParams ; then - lircDriver=$(dmesg | grep usbcore | grep -i 'lirc' | sed -e "s/.* $lirc*$/\1/" | head -n 1) - if [ ! -n "$lircDriver" ] ; then - # No lirc driver loaded - exit - fi - - # Wait for udevtrigger to settle down (if any) - udevTriggerPID=$(ps x | grep udevtrigger | grep -v grep | cut -f2 -d ' ') - if [ -n "udevTriggerPID" }; then - while test -d /proc/$udevTriggerPID; do sleep 1; done; - fi - - usbPort=$(findUSBPort "${lircDriver}") - - if [ -z "$usbPort" ]; then - # No USB Remote found - exit - fi - - usbStatus=`cat /proc/acpi/wakeup | grep $usbPort | awk {'print $3}'` - if [ "$usbStatus" = "disabled" ]; then - echo $usbPort > /proc/acpi/wakeup - echo -1 >/sys/module/usbcore/parameters/autosuspend - fi - fi -end script - pre-stop script touch /tmp/noRestartXBMC rm /tmp/xbmcliveParams diff -Nru xbmc-10.00~svn33778/tools/Linux/xbmc.sh.in xbmc-10.00~svn34731/tools/Linux/xbmc.sh.in --- xbmc-10.00~svn33778/tools/Linux/xbmc.sh.in 2010-08-22 21:16:47.000000000 +0000 +++ xbmc-10.00~svn34731/tools/Linux/xbmc.sh.in 2010-10-07 20:25:58.000000000 +0000 @@ -40,11 +40,11 @@ single_stacktrace() { - find $1 -maxdepth $2 -name 'core*' -exec \ - echo "=====> Core file: {}" 2> /dev/null >> $FILE \; -exec \ - echo " ========================================= " 2> /dev/null >> $FILE \; -exec \ - gdb "$LIBDIR/xbmc/xbmc.bin" --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; -exec \ - rm -f {} \; + find $1 -maxdepth $2 -name 'core*' $ -exec \ + echo "=====> Core file: {}" 2> /dev/null >> $FILE \; , -exec \ + echo " ========================================= " 2> /dev/null >> $FILE \; , -exec \ + gdb "$LIBDIR/xbmc/xbmc.bin" --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; , -exec \ + rm -f {} \; $ } print_crash_report() diff -Nru xbmc-10.00~svn33778/tools/Linux/xbmc-standalone.sh xbmc-10.00~svn34731/tools/Linux/xbmc-standalone.sh --- xbmc-10.00~svn33778/tools/Linux/xbmc-standalone.sh 2010-05-16 18:21:40.000000000 +0000 +++ xbmc-10.00~svn34731/tools/Linux/xbmc-standalone.sh 2010-10-09 13:00:20.000000000 +0000 @@ -18,22 +18,17 @@ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # http://www.gnu.org/copyleft/gpl.html -if which pulse-session; then - XBMC="pulse-session xbmc --standalone \"$@\"" -else - XBMC="xbmc --standalone \"$@\"" +PULSE=$(which pulseaudio) +if [ ! -z "$PULSE" ]; then + $PULSE --start fi +XBMC="xbmc --standalone \"$@\"" + LOOP=1 CRASHCOUNT=0 LASTSUCCESSFULSTART=$(date +%s) -# Output warning in case ulimit is unsupported by shell -eval ulimit -c unlimited -if [ ! $? = "0" ]; then - echo "xbmc-standalone: ulimit is unsupported by this shell" 1>&2 -fi - while [ $(( $LOOP )) = "1" ] do $XBMC diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/diskmounter xbmc-10.00~svn34731/tools/XBMCLive/diskmounter --- xbmc-10.00~svn33778/tools/XBMCLive/diskmounter 2010-06-08 09:19:17.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/diskmounter 2010-09-22 10:16:43.000000000 +0000 @@ -48,7 +48,7 @@ if [[ ! `grep $drive /etc/fstab` && ! `pmount | grep $drive` && ! `mount | grep $drive` ]]; then if [ -e /sys/block/${drive%?}/removable ]; then if [ "$(cat /sys/block/${drive%?}/removable)" = "0" ]; then - uuid=`blkid /dev/$drive | awk 'BEGIN{RS="UUID="}/-/{gsub(/ .*/,"");print}' | sed s/'"'/''/g` + uuid=`blkid -o udev /dev/$drive | grep UUID= | cut -d"=" -f2` if [ ! -d /media/$uuid ] ; then mkdir /media/$uuid fi @@ -76,7 +76,7 @@ uuid=`blkid /dev/$drive | awk 'BEGIN{RS="UUID="}/-/{gsub(/ .*/,"");print}' | sed s/'"'/''/g` if [ -e /sys/block/${drive%?}/removable ]; then if [ "$(cat /sys/block/${drive%?}/removable)" = "0" ]; then - uuid=`blkid /dev/$drive | awk 'BEGIN{RS="UUID="}/-/{gsub(/ .*/,"");print}' | sed s/'"'/''/g` + uuid=`blkid -o udev /dev/$drive | grep UUID= | cut -d"=" -f2` if [ ! -d /media/$uuid ] ; then mkdir /media/$uuid fi @@ -104,7 +104,7 @@ if [[ ! `grep $drive /etc/fstab` && ! `pmount | grep $drive` && ! `mount | grep $drive` ]]; then if [ -e /sys/block/${drive%?}/removable ]; then if [ "$(cat /sys/block/${drive%?}/removable)" = "0" ]; then - uuid=`blkid /dev/$drive | awk 'BEGIN{RS="UUID="}/-/{gsub(/ .*/,"");print}' | sed s/'"'/''/g` + uuid=`blkid -o udev /dev/$drive | grep UUID= | cut -d"=" -f2` if [ ! -d /media/$uuid ] ; then mkdir /media/$uuid fi @@ -131,7 +131,7 @@ if [[ ! `grep $drive /etc/fstab` && ! `pmount | grep $drive` && ! `mount | grep $drive` ]]; then if [ -e /sys/block/${drive%?}/removable ]; then if [ "$(cat /sys/block/${drive%?}/removable)" = "0" ]; then - uuid=`blkid /dev/$drive | awk 'BEGIN{RS="UUID="}/-/{gsub(/ .*/,"");print}' | sed s/'"'/''/g` + uuid=`blkid -o udev /dev/$drive | grep UUID= | cut -d"=" -f2` if [ ! -d /media/$uuid ] ; then mkdir /media/$uuid fi diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/live.d/01-configureXorg.sh xbmc-10.00~svn34731/tools/XBMCLive/live.d/01-configureXorg.sh --- xbmc-10.00~svn33778/tools/XBMCLive/live.d/01-configureXorg.sh 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/live.d/01-configureXorg.sh 2010-10-11 09:52:54.000000000 +0000 @@ -0,0 +1,85 @@ +#!/bin/bash + +# Copyright (C) 2005-2008 Team XBMC +# http://www.xbmc.org +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with XBMC; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html + +kernelParams=$(cat /proc/cmdline) +subString=${kernelParams##*xbmc=} +xbmcParams=${subString%% *} + +activationToken="nogenxconf" + +# if strings are NOT the same the token is part of the parameters list +# here we want to stop script if the token is there +if [ "$xbmcParams" != "${xbmcParams%$activationToken*}" ] ; then + exit 0 +fi + +# Generates valid xorg.conf for proprietary drivers if missing +if [ -e /etc/X11/xorg.conf ] ; then + exit 0 +fi + +# Identify Ubuntu release +LSBRELEASE="$(lsb_release -r | cut -f2 | sed 's/\.//')" + +# Identify GPU, Intel by default +GPUTYPE="INTEL" + +GPU=$(lspci -nn | grep 0300) +# 10de == NVIDIA +if [ "$(echo $GPU | grep 10de)" ]; then + GPUTYPE="NVIDIA" +else + # 1002 == AMD + if [ "$(echo $GPU | grep 1002)" ]; then + GPUTYPE="AMD" + fi +fi + +if [ "$GPUTYPE" = "NVIDIA" ]; then + if [ $LSBRELEASE -gt 910 ]; then + # only on lucid! + update-alternatives --set gl_conf /usr/lib/nvidia-current/ld.so.conf + ldconfig + fi + + # run nvidia-xconfig + /usr/bin/nvidia-xconfig -s --no-logo --no-composite --no-dynamic-twinview --force-generate + + # Disable scaling to make sure the gpu does not loose performance + sed -i -e 's%Section \"Screen\"%&\n Option \"FlatPanelProperties\" \"Scaling = Native\"\n Option \"HWCursor\" \"Off\"%' /etc/X11/xorg.conf +fi + +if [ "$GPUTYPE" = "AMD" ]; then + # run aticonfig + /usr/bin/aticonfig --initial --sync-vsync=on -f + ATICONFIG_RETURN_CODE=$? + + if [ $ATICONFIG_RETURN_CODE -eq 255 ]; then + # aticonfig returns 255 on old unsuported ATI cards + # Let the X default ati driver handle the card + modprobe radeon # Required to permit KMS switching and support hardware GL + else + if [ $LSBRELEASE -gt 910 ]; then + # only on lucid! + update-alternatives --set gl_conf /usr/lib/fglrx/ld.so.conf + ldconfig + fi + fi +fi diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/live.d/02-profileRedir.sh xbmc-10.00~svn34731/tools/XBMCLive/live.d/02-profileRedir.sh --- xbmc-10.00~svn33778/tools/XBMCLive/live.d/02-profileRedir.sh 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/live.d/02-profileRedir.sh 2010-10-11 09:52:54.000000000 +0000 @@ -0,0 +1,62 @@ +#!/bin/bash + +# Copyright (C) 2005-2008 Team XBMC +# http://www.xbmc.org +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with XBMC; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html + +# +# Exiting if run on a live system only +# +if ! grep "boot=live" /proc/cmdline ; then + exit 0 +fi + +# +# Exiting if booting from Live CD +# +if [ "$(mount | grep iso9660)" ]; then + exit 0 +fi + +kernelParams=$(cat /proc/cmdline) + +subString=${kernelParams##*xbmc=} +xbmcParams=${subString%% *} + +activationToken="noredir" + +# if strings are NOT the same the token is part of the parameters list +# here we want to stop script if the token is there +if [ "$xbmcParams" != "${xbmcParams%$activationToken*}" ] ; then + exit 0 +fi + +BOOTMEDIAMOUNTPOINT=$1 + +if [ -n "$BOOTMEDIAMOUNTPOINT" ]; then + if [ ! -d $BOOTMEDIAMOUNTPOINT/dotXBMC ]; then + mkdir $BOOTMEDIAMOUNTPOINT/dotXBMC + fi + if [ -d /home/xbmc/.xbmc ]; then + if [ -L /home/xbmc/.xbmc ]; then + rm /home/xbmc/.xbmc + else + mv /home/xbmc/.xbmc /home/xbmc/.xbmc.previous + fi + fi + ln -s $BOOTMEDIAMOUNTPOINT/dotXBMC /home/xbmc/.xbmc +fi diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/live.d/03-configNVIDIAHDMI.sh xbmc-10.00~svn34731/tools/XBMCLive/live.d/03-configNVIDIAHDMI.sh --- xbmc-10.00~svn33778/tools/XBMCLive/live.d/03-configNVIDIAHDMI.sh 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/live.d/03-configNVIDIAHDMI.sh 2010-10-11 09:52:54.000000000 +0000 @@ -0,0 +1,93 @@ +#!/bin/bash + +# Copyright (C) 2005-2008 Team XBMC +# http://www.xbmc.org +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with XBMC; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html + +# +# Nvidia ION detection +# + +NvidiaHDMIFirstGen=$(lspci -nn | grep '0403' | grep '10de:0ac0') #MCP79 High Definition Audio +NvidiaHDMISecondGen=$(lspci -nn | grep '0403' | grep '10de:0be3') #MCP79 High Definition Audio + +if [ ! -n "$NvidiaHDMISecondGen" ] && [ ! -n "$NvidiaHDMIFirstGen" ] ; then + exit 0 +fi + +# +# Set Nvidia HDMI variables +# + +HDMICARD=$(aplay -l | grep 'NVIDIA HDMI' -m1 | awk -F: '{ print $1 }' | awk '{ print $2 }') +HDMIDEVICE=$(aplay -l | grep 'NVIDIA HDMI' -m1 | awk -F: '{ print $2 }' | awk '{ print $5 }') + +# +# Bails out if we don't have digital outputs +# +if [ -z $HDMICARD ] || [ -z $HDMIDEVICE ]; then + exit 0 +fi + +# +# Restart only if needed +# +restartALSA="" + +# +# Setup kernel module parameters +# + +if [ -n "$NvidiaHDMISecondGen" ] ; then + if ! grep -i -q snd-hda-intel /etc/modprobe.d/alsa-base.conf ; then + if [ $HDMICARD,$HDMIDEVICE == 1,3 ]; then + echo 'options snd-hda-intel enable_msi=0 probe_mask=0xffff,0xfff2' >> /etc/modprobe.d/alsa-base.conf + restartALSA="1" + elif [ $HDMICARD,$HDMIDEVICE == 0,3 ]; then + echo 'options snd-hda-intel enable_msi=0 probe_mask=0xfff2' >> /etc/modprobe.d/alsa-base.conf + restartALSA="1" + elif [ $HDMICARD,$HDMIDEVICE == 2,3 ]; then + echo 'options snd-hda-intel enable_msi=0 probe_mask=0xffff,0xffff,0xfff2' >> /etc/modprobe.d/alsa-base.conf + restartALSA="1" + fi + fi +fi + +if [ -n "$restartALSA" ] ; then + # + # Restart Alsa + # + + alsa-utils stop &> /dev/null + alsa force-reload &> /dev/null + alsa-utils start &> /dev/null + + # + # Unmute digital output + # + + /usr/bin/amixer -q -c 0 sset 'IEC958 Default PCM',0 unmute &> /dev/null + /usr/bin/amixer -q -c 0 sset 'IEC958',0 unmute &> /dev/null + /usr/bin/amixer -q -c 0 sset 'IEC958',1 unmute &> /dev/null + /usr/bin/amixer -c 1 sset 'IEC958' unmute &> /dev/null + + # + # Store alsa settings + # + + alsactl store &> /dev/null +fi diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/live.d/04-configNVIDIAasoundrc.sh xbmc-10.00~svn34731/tools/XBMCLive/live.d/04-configNVIDIAasoundrc.sh --- xbmc-10.00~svn33778/tools/XBMCLive/live.d/04-configNVIDIAasoundrc.sh 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/live.d/04-configNVIDIAasoundrc.sh 2010-10-11 10:03:12.000000000 +0000 @@ -0,0 +1,215 @@ +#!/bin/bash + +# Copyright (C) 2005-2008 Team XBMC +# http://www.xbmc.org +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with XBMC; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html + +# +# Nvidia ION detection +# + +NvidiaHDMIFirstGen=$(lspci -nn | grep '0403' | grep '10de:0ac0') #MCP79 High Definition Audio +NvidiaHDMISecondGen=$(lspci -nn | grep '0403' | grep '10de:0be3') #MCP79 High Definition Audio + +if [ ! -n "$NvidiaHDMISecondGen" ] && [ ! -n "$NvidiaHDMIFirstGen" ] ; then + exit 0 +fi + + +kernelParams=$(cat /proc/cmdline) +subString=${kernelParams##*xbmc=} +xbmcParams=${subString%% *} + +activationToken="noalsaconfig" + +# if strings are NOT the same the token is part of the parameters list +# here we want to stop script if the token is there +if [ "$xbmcParams" != "${xbmcParams%$activationToken*}" ] ; then + exit 0 +fi + +# +# Set Nvidia HDMI variables +# + +HDMICARD=$(aplay -l | grep 'NVIDIA HDMI' -m1 | awk -F: '{ print $1 }' | awk '{ print $2 }') +HDMIDEVICE=$(aplay -l | grep 'NVIDIA HDMI' -m1 | awk -F: '{ print $2 }' | awk '{ print $5 }') + +if [ -n "$NvidiaHDMIFirstGen" ] ; then + # "VT1708S Digital" + # "ALC662 rev1 Digital" + # "ALC1200 Digital" + # "ALC662 Digital" + # "ALC889A Digital" + # "ALC888 Digital" + # "ALC887 Digital" + DIGITALCONTROL="VT1708S Digital\|ALC662 rev1 Digital\|ALC1200 Digital\|ALC662 Digital\|ALC889A Digital\|ALC888 Digital\|ALC887 Digital" +fi + +if [ -n "$NvidiaHDMISecondGen" ] ; then + # "ALC887 Digital" + # "ALC888 Digital" + DIGITALCONTROL="ALC888 Digital\|ALC887 Digital" +fi + +# +# Retrieve Digital Settings before .asoundrc creation +# + +DIGITALCARD=$(aplay -l | grep "$DIGITALCONTROL" | awk -F: '{ print $1 }' | awk '{ print $2 }') +DIGITALDEVICE=$(aplay -l | grep "$DIGITALCONTROL" | awk -F: '{ print $2 }' | awk '{ print $5 }') + +ANALOGCARD=$(aplay -l | grep 'Analog' -m1 | awk -F: '{ print $1 }' | awk '{ print $2 }') +ANALOGDEVICE=$(aplay -l | grep 'Analog' -m1 | awk -F: '{ print $2 }' | awk '{ print $5 }') + +# +# Bails out if we don't have digital outputs +# +if [ -z $HDMICARD ] || [ -z $HDMIDEVICE ] || [ -z $DIGITALCARD ] || [ -z $DIGITALDEVICE ]; then + exit 0 +fi + +# +# Setup .asoundrc +# +xbmcUser=xbmc +# Read configuration variable file if it is present +[ -r /etc/default/xbmc-live ] && . /etc/default/xbmc-live +if ! getent passwd $xbmcUser >/dev/null; then + xbmcUser=$(getent passwd 1000 | sed -e 's/\:.*//') +fi + +if [ ! -f /home/$xbmcUser/.asoundrc ] ; then + cat > /home/$xbmcUser/.asoundrc << 'EOF' + +pcm.both { + type route + slave { + pcm multi + channels 6 + } + ttable.0.0 1.0 + ttable.1.1 1.0 + ttable.0.2 1.0 + ttable.1.3 1.0 + ttable.0.4 1.0 + ttable.1.5 1.0 +} + +pcm.multi { + type multi + slaves.a { + pcm "hdmi_hw" + channels 2 + } + slaves.b { + pcm "digital_hw" + channels 2 + } + slaves.c { + pcm "analog_hw" + channels 2 + } + bindings.0.slave a + bindings.0.channel 0 + bindings.1.slave a + bindings.1.channel 1 + bindings.2.slave b + bindings.2.channel 0 + bindings.3.slave b + bindings.3.channel 1 + bindings.4.slave c + bindings.4.channel 0 + bindings.5.slave c + bindings.5.channel 1 +} + +pcm.hdmi_hw { + type hw + =HDMICARD= + =HDMIDEVICE= + channels 2 +} + +pcm.hdmi_formatted { + type plug + slave { + pcm hdmi_hw + rate 48000 + channels 2 + } +} + +pcm.hdmi_complete { + type softvol + slave.pcm hdmi_formatted + control.name hdmi_volume + control.=HDMICARD= +} + +pcm.digital_hw { + type hw + =DIGITALCARD= + =DIGITALDEVICE= + channels 2 +} + +pcm.analog_hw { + type hw + =ANALOGCARD= + =ANALOGDEVICE= + channels 2 +} +EOF + + sed -i "s/=HDMICARD=/card $HDMICARD/g" /home/$xbmcUser/.asoundrc + sed -i "s/=HDMIDEVICE=/device $HDMIDEVICE/g" /home/$xbmcUser/.asoundrc + + sed -i "s/=DIGITALCARD=/card $DIGITALCARD/g" /home/$xbmcUser/.asoundrc + sed -i "s/=DIGITALDEVICE=/device $DIGITALDEVICE/g" /home/$xbmcUser/.asoundrc + + sed -i "s/=ANALOGCARD=/card $ANALOGCARD/g" /home/$xbmcUser/.asoundrc + sed -i "s/=ANALOGDEVICE=/device $ANALOGDEVICE/g" /home/$xbmcUser/.asoundrc + + chown $xbmcUser:$xbmcUser /home/$xbmcUser/.asoundrc + + # + # Setup Triple Audiooutput + # + if [ ! -f /home/$xbmcUser/.xbmc/userdata/guisettings.xml ] ; then + cat > /home/$xbmcUser/.xbmc/userdata/guisettings.xml << 'EOF' + + + custom + 0 + plug:both + 2 + alsa:hdmi + + +EOF + else + sed -i 's#[0-9]*#\1'custom'\2#g' /home/$xbmcUser/.xbmc/userdata/guisettings.xml + sed -i 's#[0-9]*#\1'0'\2#g' /home/$xbmcUser/.xbmc/userdata/guisettings.xml + sed -i 's#[0-9]*#\1'plug:both'\2#g' /home/$xbmcUser/.xbmc/userdata/guisettings.xml + sed -i 's#[0-9]*#\1'2'\2#g' /home/$xbmcUser/.xbmc/userdata/guisettings.xml + sed -i 's#[0-9]*#\1'alsa:hdmi'\2#g' /home/$xbmcUser/.xbmc/userdata/guisettings.xml + fi + + chown -R $xbmcUser:$xbmcUser /home/$xbmcUser/.xbmc +fi + diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/live.d/10-setVolumes.sh xbmc-10.00~svn34731/tools/XBMCLive/live.d/10-setVolumes.sh --- xbmc-10.00~svn33778/tools/XBMCLive/live.d/10-setVolumes.sh 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/live.d/10-setVolumes.sh 2010-10-11 09:52:54.000000000 +0000 @@ -0,0 +1,34 @@ +#!/bin/bash + +# Copyright (C) 2005-2008 Team XBMC +# http://www.xbmc.org +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with XBMC; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html + +kernelParams=$(cat /proc/cmdline) + +subString=${kernelParams##*xbmc=} +xbmcParams=${subString%% *} + +activationToken="setvolume" + +# if strings are the same the token is NOT part of the parameters list +# here we want to stop script if the token is NOT there +if [ "$xbmcParams" = "${xbmcParams%$activationToken*}" ] ; then + exit 0 +fi + +/usr/bin/setAlsaVolumes 90 diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/live.d/11-mountDisks.sh xbmc-10.00~svn34731/tools/XBMCLive/live.d/11-mountDisks.sh --- xbmc-10.00~svn33778/tools/XBMCLive/live.d/11-mountDisks.sh 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/live.d/11-mountDisks.sh 2010-10-11 09:52:54.000000000 +0000 @@ -0,0 +1,34 @@ +#!/bin/bash + +# Copyright (C) 2005-2008 Team XBMC +# http://www.xbmc.org +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with XBMC; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html + +kernelParams=$(cat /proc/cmdline) + +subString=${kernelParams##*xbmc=} +xbmcParams=${subString%% *} + +activationToken="nodiskmount" + +# if strings are the same the token is NOT part of the parameters list +# here we want to stop script if the token is there +if [ "$xbmcParams" != "${xbmcParams%$activationToken*}" ] ; then + exit 0 +fi + +/usr/bin/diskmounter diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/live.d/12-setupWakeFromUSB.sh xbmc-10.00~svn34731/tools/XBMCLive/live.d/12-setupWakeFromUSB.sh --- xbmc-10.00~svn33778/tools/XBMCLive/live.d/12-setupWakeFromUSB.sh 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/live.d/12-setupWakeFromUSB.sh 2010-10-11 09:52:54.000000000 +0000 @@ -0,0 +1,98 @@ +#!/bin/bash + +# Copyright (C) 2005-2008 Team XBMC +# http://www.xbmc.org +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with XBMC; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html + +findUSBPort() { + local FD=7 + local tmpFile=$(mktemp) + local eof=0 + local line + local usbPort="" + local pciDevice="" + local inBlock="0" + local token=$1 + + lshal > $tmpFile + + # Open files. + eval exec "$FD<$tmpFile" + + while [ $eof -eq 0 ] + do + if read line <&$FD; then + if [ -n "$(echo $line | grep -i $token)" ]; then + if [ "$inBlock" = "0" ]; then + inBlock="1" + token="linux.sysfs_path" + else + pciDevice=$(echo $line | awk -F/ '{ print $5}') + eof=1 + fi + fi + else + eof=1 + fi + done + + if [ -n "$pciDevice" ] ; then + usbPort=$(cat /proc/acpi/wakeup | grep $pciDevice | awk '{ print $1}') + fi + + echo $usbPort +} + + +kernelParams=$(cat /proc/cmdline) + +subString=${kernelParams##*xbmc=} +xbmcParams=${subString%% *} + +activationToken="wakeOnUSBRemote" + +# if strings are the same the token is NOT part of the parameters list +# here we want to stop script if the token is NOT there +if [ "$xbmcParams" = "${xbmcParams%$activationToken*}" ] ; then + exit +fi + +lircDriver=$(dmesg | grep usbcore | grep -i 'lirc' | sed -e "s/.* $lirc*$/\1/" | head -n 1) +if [ ! -n "$lircDriver" ] ; then + # No lirc driver loaded + exit 0 +fi + +# Wait for udevtrigger to settle down (if any) +udevTriggerPID=$(ps x | grep udevtrigger | grep -v grep | cut -f2 -d ' ') +if [ -n "udevTriggerPID" }; then + while test -d /proc/$udevTriggerPID; do sleep 1; done; +fi + +usbPort=$(findUSBPort "${lircDriver}") + +if [ -z "$usbPort" ]; then + # No USB Remote found + exit 0 +fi + +usbStatus=`cat /proc/acpi/wakeup | grep $usbPort | awk {'print $3}'` +if [ "$usbStatus" = "disabled" ]; then + echo $usbPort > /proc/acpi/wakeup + echo -1 >/sys/module/usbcore/parameters/autosuspend +fi + diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/Makefile xbmc-10.00~svn34731/tools/XBMCLive/Makefile --- xbmc-10.00~svn33778/tools/XBMCLive/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/Makefile 2010-10-07 09:07:36.000000000 +0000 @@ -0,0 +1,11 @@ +CLEAN_FILES = setAlsaVolumes + +setAlsaVolumes: setAlsaVolumes.c +ifneq ($(findstring osx,$(ARCH)), osx) + $(CC) $(CFLAGS) $(DEFINES) -g -D_LINUX -D_REENTRANT \ + -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ + -D__USE_FILE_OFFSET64 $(INCLUDES) $< -o $@ -lasound +endif + +include ../../Makefile.include +-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS))) diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/debian/control xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/debian/control --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/debian/control 2009-12-01 16:01:29.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/debian/control 2010-09-28 10:09:04.000000000 +0000 @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 5.0.22) Package: xbmclive-installhelpers -Architecture: i386 +Architecture: all XC-Package-Type: udeb Depends: ${shlibs:Depends}, ${misc:Depends} Description: XBMCLive install helpers for Debian Installer diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/14runHooks xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/14runHooks --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/14runHooks 2010-08-18 12:34:15.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/14runHooks 2010-09-22 13:21:37.000000000 +0000 @@ -20,7 +20,7 @@ hookDir=Hooks -cp -R /cdrom/$hookDir /target/tmp +cp -R /cdrom/install/$hookDir /target/tmp cat > /target/tmp/runHooks.sh << 'EOF' hookDir=$1 diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/93modifyGrubMenu.lucid-variant xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/93modifyGrubMenu.lucid-variant --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/93modifyGrubMenu.lucid-variant 2010-06-28 08:34:42.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/93modifyGrubMenu.lucid-variant 2010-09-23 10:34:35.000000000 +0000 @@ -30,8 +30,8 @@ echo >> /target/etc/default/grub echo '# Defaults from XBMC Installation' >> /target/etc/default/grub echo 'GRUB_CMDLINE_LINUX_DEFAULT="quiet splash xbmc=autostart,nodiskmount,setvolume loglevel=0 video=vesafb"' >> /target/etc/default/grub - echo 'GRUB_GFXMODE="1024x768x32;800x600x32;640x480x32;1024x768;800x600;640x480"' >> /target/etc/default/grub - echo 'GRUB_GFXPAYLOAD_LINUX=keep' >> /target/etc/default/grub + echo 'GRUB_GFXMODE="800x600"' >> /target/etc/default/grub + echo 'GRUB_GFXPAYLOAD_LINUX="800x600"' >> /target/etc/default/grub in-target update-grub fi diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildHook-proposed.sh.lucid-variant xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildHook-proposed.sh.lucid-variant --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildHook-proposed.sh.lucid-variant 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildHook-proposed.sh.lucid-variant 2010-09-21 14:41:50.000000000 +0000 @@ -0,0 +1,28 @@ +#!/bin/sh + +# Copyright (C) 2005-2010 Team XBMC +# http://www.xbmc.org +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with XBMC; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html + + +cat > $WORKPATH/buildLive/Files/chroot_sources/proposed.list.chroot << EOF +deb http://archive.ubuntu.com/ubuntu/ lucid-proposed main restricted universe multiverse +EOF + +cat > $WORKPATH/buildLive/Files/chroot_sources/proposed.list.binary << EOF +deb http://archive.ubuntu.com/ubuntu/ lucid-proposed main restricted universe multiverse +EOF diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_grub/grub.cfg.lucid-variant xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_grub/grub.cfg.lucid-variant --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_grub/grub.cfg.lucid-variant 2010-08-13 09:24:47.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_grub/grub.cfg.lucid-variant 2010-09-23 10:34:35.000000000 +0000 @@ -5,7 +5,7 @@ insmod vbe insmod font insmod gfxterm -set gfxmode="1280x768x32;1280x720x32;1024x768x32;800x600x32;640x480x32;1280x768;1280x720;1024x768;800x600;640x480" +set gfxmode="800x600" if loadfont ($root)/boot/grub/unicode.pf2 ; then if terminal_output gfxterm ; then true ; else # For backward compatibility with versions of terminal.mod that don't @@ -32,15 +32,15 @@ menuentry "XBMCLive" { set quiet=1 - set gfxpayload=keep - linux /live/vmlinuz video=vesafb boot=live xbmc=autostart,nodiskmount,setvolume splash quiet loglevel=0 persistent quickreboot quickusbmodules notimezone noaccessibility noapparmor noaptcdrom noautologin noxautologin noconsolekeyboard nofastboot nognomepanel nohosts nokpersonalizer nolanguageselector nolocales nonetworking nopowermanagement noprogramcrashes nojockey nosudo noupdatenotifier nouser nopolkitconf noxautoconfig noxscreensaver nopreseed union=aufs + set gfxpayload="800x600" + linux /live/vmlinuz video=vesafb boot=live xbmc=autostart,nodiskmount,setvolume,noalsaconfig splash quiet loglevel=0 persistent quickreboot quickusbmodules notimezone noaccessibility noapparmor noaptcdrom noautologin noxautologin noconsolekeyboard nofastboot nognomepanel nohosts nokpersonalizer nolanguageselector nolocales nonetworking nopowermanagement noprogramcrashes nojockey nosudo noupdatenotifier nouser nopolkitconf noxautoconfig noxscreensaver nopreseed union=aufs initrd /live/initrd.img } menuentry "XBMCLive, SAFE MODE" { set quiet=1 set gfxpayload=text - linux /live/vmlinuz boot=live xbmc=nodiskmount,setvolume quiet loglevel=0 persistent quickreboot quickusbmodules notimezone noaccessibility noapparmor noaptcdrom noautologin noxautologin noconsolekeyboard nofastboot nognomepanel nohosts nokpersonalizer nolanguageselector nolocales nonetworking nopowermanagement noprogramcrashes nojockey nosudo noupdatenotifier nouser nopolkitconf noxautoconfig noxscreensaver nopreseed union=aufs + linux /live/vmlinuz boot=live xbmc=nodiskmount,setvolume,noalsaconfig quiet loglevel=0 persistent quickreboot quickusbmodules notimezone noaccessibility noapparmor noaptcdrom noautologin noxautologin noconsolekeyboard nofastboot nognomepanel nohosts nokpersonalizer nolanguageselector nolocales nonetworking nopowermanagement noprogramcrashes nojockey nosudo noupdatenotifier nouser nopolkitconf noxautoconfig noxscreensaver nopreseed union=aufs initrd /live/initrd.img } diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_AMD.sh xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_AMD.sh --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_AMD.sh 2010-09-02 13:32:17.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_AMD.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -#!/bin/bash - -#check AMD GPU -amdGpuType=$(lspci -nn | grep 'VGA' | grep 1002) -if [ ! -n "$amdGpuType" ] ; then - exit 0 -fi - -xbmcUser=$(getent passwd 1000 | sed -e 's/\:.*//') - -mkdir -p /home/$xbmcUser/.xbmc/userdata - -# -# Always sync to vblank -# -if [ ! -f /home/$xbmcUser/.xbmc/userdata/guisettings.xml ] ; then - cat > /home/$xbmcUser/.xbmc/userdata/guisettings.xml << 'EOF' - - - 2 - - -EOF -fi - -chown -R $xbmcUser:$xbmcUser /home/$xbmcUser/.xbmc diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA_HDMI.sh xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA_HDMI.sh --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA_HDMI.sh 2010-09-09 15:38:20.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA_HDMI.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,155 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2005-2008 Team XBMC -# http://www.xbmc.org -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with XBMC; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html - -NvidiaHDMIFirstGen=$(lspci -nn | grep '0403' | grep '10de:0ac0') #MCP79 High Definition Audio -NvidiaHDMISecondGen=$(lspci -nn | grep '0403' | grep '10de:0be3') #MCP79 High Definition Audio - -if [ ! -n "$NvidiaHDMISecondGen" ] && [ ! -n "$NvidiaHDMIFirstGen" ] ; then - exit 0 -fi - -HDMICARD=$(aplay -l | grep 'NVIDIA HDMI' | awk -F: '{ print $1 }' | awk '{ print $2 }') -HDMIDEVICE=$(aplay -l | grep 'NVIDIA HDMI' | awk -F: '{ print $2 }' | awk '{ print $5 }') - -if [ -n "$NvidiaHDMIFirstGen" ] ; then - # "VT1708S Digital" - # "ALC662 rev1 Digital" - # "ALC1200 Digital" - # "ALC662 Digital" - # "ALC889A Digital" - DIGITALCONTROL="VT1708S Digital\|ALC662 rev1 Digital\|ALC1200 Digital\|ALC662 Digital\|ALC889A Digital" -fi - -if [ -n "$NvidiaHDMISecondGen" ] ; then - # "ALC888 Digital" - DIGITALCONTROL="ALC888 Digital" -fi - - -# -# Setup kernel module parameters -# - -if [ -n "$NvidiaHDMISecondGen" ] ; then - if ! grep -i -q snd-hda-intel /etc/modprobe.d/alsa-base.conf ; then - if [ $HDMICARD,$HDMIDEVICE == 1,3 ]; then - echo 'options snd-hda-intel enable_msi=0 probe_mask=0xffff,0xfff2' >> /etc/modprobe.d/alsa-base.conf - elif [ $HDMICARD,$HDMIDEVICE == 0,3 ]; then - echo 'options snd-hda-intel enable_msi=0 probe_mask=0xfff2' >> /etc/modprobe.d/alsa-base.conf - elif [ $HDMICARD,$HDMIDEVICE == 2,3 ]; then - echo 'options snd-hda-intel enable_msi=0 probe_mask=0xffff,0xffff,0xfff2' >> /etc/modprobe.d/alsa-base.conf - # else - # echo "No matching value detected" - fi - fi -fi - -# -# Setup .asoundrc -# - -xbmcUser=$(getent passwd 1000 | sed -e 's/\:.*//') - -if [ ! -f /home/$xbmcUser/.asoundrc ] ; then - cat > /home/$xbmcUser/.asoundrc << 'EOF' -pcm.!default { - type plug - slave { - pcm "both" - } -} -pcm.both { - type route - slave { - pcm multi - channels 4 - } - ttable.0.0 1.0 - ttable.1.1 1.0 - ttable.0.2 1.0 - ttable.1.3 1.0 -} -pcm.multi { - type multi - slaves.a { - pcm "tv" - channels 2 - } - slaves.b { - pcm "dmixrec" - channels 2 - } - bindings.0.slave a - bindings.0.channel 0 - bindings.1.slave a - bindings.1.channel 1 - bindings.2.slave b - bindings.2.channel 0 - bindings.3.slave b - bindings.3.channel 1 -} -pcm.dmixrec { - type dmix - ipc_key 1024 - slave { - pcm "receiver" - period_time 0 - period_size 1024 - buffer_size 8192 - rate 48000 - } - bindings { - 0 0 - 1 1 - } -} -pcm.tv { - type hw - =HDMICARD= - =HDMIDEVICE= - channels 2 -} -pcm.receiver { - type hw - =DIGITALCARD= - =DIGITALDEVICE= - channels 2 -} -EOF - - DIGITALCARD=$(aplay -l | grep $DIGITALCONTROL | awk -F: '{ print $1 }' | awk '{ print $2 }') - DIGITALDEVICE=$(aplay -l | grep $DIGITALCONTROL | awk -F: '{ print $2 }' | awk '{ print $5 }') - - sed -i "s/=HDMICARD=/card $HDMICARD/g" /home/$xbmcUser/.asoundrc - sed -i "s/=HDMIDEVICE=/device $HDMIDEVICE/g" /home/$xbmcUser/.asoundrc - - sed -i "s/=DIGITALCARD=/card $DIGITALCARD/g" /home/$xbmcUser/.asoundrc - sed -i "s/=DIGITALDEVICE=/device $DIGITALDEVICE/g" /home/$xbmcUser/.asoundrc - - chown -R $xbmcUser:$xbmcUser /home/$xbmcUser/.asoundrc -fi - -# -# Unmute digital output -# - -/usr/bin/amixer -q -c 0 sset 'IEC958 Default PCM',0 unmute > /dev/null -/usr/bin/amixer -q -c 0 sset 'IEC958',0 unmute > /dev/null -/usr/bin/amixer -q -c 0 sset 'IEC958',1 unmute > /dev/null diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA.sh xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA.sh --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA.sh 2010-09-01 13:13:40.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#!/bin/bash - - -#check Nvidia GPU -nvidiaGpuType=$(lspci -nn | grep 'VGA' | grep 'nVidia Corporation') -if [ ! -n "$nvidiaGpuType" ] ; then - exit 0 -fi - -xbmcUser=$(getent passwd 1000 | sed -e 's/\:.*//') - -mkdir -p /home/$xbmcUser/.xbmc/userdata - -if [ ! -f /home/$xbmcUser/.xbmc/userdata/advancedsettings.xml ] ; then - cat > /home/$xbmcUser/.xbmc/userdata/advancedsettings.xml << 'EOF' - - echo "$(nvidia-settings -tq gpuCoreTemp) C" - -EOF -fi - -# -# Always sync to vblank -# -if [ ! -f /home/$xbmcUser/.xbmc/userdata/guisettings.xml ] ; then - cat > /home/$xbmcUser/.xbmc/userdata/guisettings.xml << 'EOF' - - - 2 - - -EOF -fi - -chown -R $xbmcUser:$xbmcUser /home/$xbmcUser/.xbmc diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/setupSources.sh xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/setupSources.sh --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/setupSources.sh 2010-09-09 15:47:03.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/setupSources.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -#!/bin/sh - -xbmcUser=$(getent passwd 1000 | sed -e 's/\:.*//') - -# -# Create directories for XBMC sources -# - -if [ ! -d "/home/$xbmcUser/Music" ]; then - mkdir /home/$xbmcUser/Music - chmod 755 /home/$xbmcUser/Music -fi - -if [ ! -d "/home/$xbmcUser/Pictures" ]; then - mkdir /home/$xbmcUser/Pictures - chmod 755 /home/$xbmcUser/Pictures -fi - -if [ ! -d "/home/$xbmcUser/TV Shows" ]; then - mkdir "/home/$xbmcUser/TV Shows" - chmod 755 "/home/$xbmcUser/TV Shows" -fi - -if [ ! -d "/home/$xbmcUser/Videos" ]; then - mkdir /home/$xbmcUser/Videos - chmod 755 /home/$xbmcUser/Videos -fi - -mkdir -p /home/$xbmcUser/.xbmc/userdata &> /dev/null - -if [ ! -f /home/$xbmcUser/.xbmc/userdata/sources.xml ] ; then - cat > /home/$xbmcUser/.xbmc/userdata/sources.xml << EOF - -

- - - - Music - /home/$xbmcUser/Music/ - - - - - - Music - /home/$xbmcUser/Pictures/ - - - -EOF -fi -chown -R $xbmcUser:$xbmcUser /home/$xbmcUser/.xbmc diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/hwSetup_AMD.sh xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/hwSetup_AMD.sh --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/hwSetup_AMD.sh 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/hwSetup_AMD.sh 2010-09-27 09:32:38.000000000 +0000 @@ -0,0 +1,46 @@ +#!/bin/bash + +# Copyright (C) 2005-2008 Team XBMC +# http://www.xbmc.org +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with XBMC; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html + +#check AMD GPU +amdGpuType=$(lspci -nn | grep '0300' | grep '1002') +if [ ! -n "$amdGpuType" ] ; then + exit 0 +fi + +xbmcUser=$(getent passwd 1000 | sed -e 's/\:.*//') + +mkdir -p /home/$xbmcUser/.xbmc/userdata + +# +# Always sync to vblank +# +if [ ! -f /home/$xbmcUser/.xbmc/userdata/guisettings.xml ] ; then + cat > /home/$xbmcUser/.xbmc/userdata/guisettings.xml << 'EOF' + + + 2 + + +EOF +else + sed -i 's#[0-9]*#\1'2'\2#g' /home/$xbmcUser/.xbmc/userdata/guisettings.xml +fi + +chown -R $xbmcUser:$xbmcUser /home/$xbmcUser/.xbmc diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/hwSetup_NVIDIA.sh xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/hwSetup_NVIDIA.sh --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/hwSetup_NVIDIA.sh 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/hwSetup_NVIDIA.sh 2010-09-27 09:32:38.000000000 +0000 @@ -0,0 +1,54 @@ +#!/bin/bash + +# Copyright (C) 2005-2008 Team XBMC +# http://www.xbmc.org +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with XBMC; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html + +#check Nvidia GPU +nvidiaGpuType=$(lspci -nn | grep '0300' | grep '10de') +if [ ! -n "$nvidiaGpuType" ] ; then + exit 0 +fi + +xbmcUser=$(getent passwd 1000 | sed -e 's/\:.*//') + +mkdir -p /home/$xbmcUser/.xbmc/userdata + +if [ ! -f /home/$xbmcUser/.xbmc/userdata/advancedsettings.xml ] ; then + cat > /home/$xbmcUser/.xbmc/userdata/advancedsettings.xml << 'EOF' + + echo "$(nvidia-settings -tq gpuCoreTemp) C" + +EOF +fi + +# +# Always sync to vblank +# +if [ ! -f /home/$xbmcUser/.xbmc/userdata/guisettings.xml ] ; then + cat > /home/$xbmcUser/.xbmc/userdata/guisettings.xml << 'EOF' + + + 2 + + +EOF +else + sed -i 's#[0-9]*#\1'2'\2#g' /home/$xbmcUser/.xbmc/userdata/guisettings.xml +fi + +chown -R $xbmcUser:$xbmcUser /home/$xbmcUser/.xbmc diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/setupSources.sh xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/setupSources.sh --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/setupSources.sh 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/install/Hooks/setupSources.sh 2010-10-11 15:24:58.000000000 +0000 @@ -0,0 +1,66 @@ +#!/bin/sh + +xbmcUser=$(getent passwd 1000 | sed -e 's/\:.*//') + +# +# Create directories for XBMC sources +# + +if [ ! -d "/home/$xbmcUser/Music" ]; then + mkdir /home/$xbmcUser/Music + chmod 755 /home/$xbmcUser/Music + chown -R $xbmcUser:$xbmcUser /home/$xbmcUser/Music +fi + +if [ ! -d "/home/$xbmcUser/Pictures" ]; then + mkdir /home/$xbmcUser/Pictures + chmod 755 /home/$xbmcUser/Pictures + chown -R $xbmcUser:$xbmcUser /home/$xbmcUser/Pictures +fi + +if [ ! -d "/home/$xbmcUser/TV Shows" ]; then + mkdir "/home/$xbmcUser/TV Shows" + chmod 755 "/home/$xbmcUser/TV Shows" + chown -R $xbmcUser:$xbmcUser "/home/$xbmcUser/TV Shows" +fi + +if [ ! -d "/home/$xbmcUser/Videos" ]; then + mkdir /home/$xbmcUser/Videos + chmod 755 /home/$xbmcUser/Videos + chown -R $xbmcUser:$xbmcUser /home/$xbmcUser/Videos +fi + +mkdir -p /home/$xbmcUser/.xbmc/userdata &> /dev/null + +if [ ! -f /home/$xbmcUser/.xbmc/userdata/sources.xml ] ; then + cat > /home/$xbmcUser/.xbmc/userdata/sources.xml << EOF + +

+ + + + Music + /home/$xbmcUser/Music/ + + + + + + Music + /home/$xbmcUser/Pictures/ + + + +EOF +fi +chown -R $xbmcUser:$xbmcUser /home/$xbmcUser/.xbmc diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/00-installCrystalHD.lucid-variant xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/00-installCrystalHD.lucid-variant --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/00-installCrystalHD.lucid-variant 2010-08-20 09:41:18.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/00-installCrystalHD.lucid-variant 2010-10-04 14:26:57.000000000 +0000 @@ -22,6 +22,8 @@ echo "Building CrystalHD drivers..." echo "" +apt-get -y install g++ autoconf + # if [ ! -f /etc/mtab ]; then ln -s /proc/mounts /etc/mtab @@ -77,7 +79,7 @@ mkdir -p kernel/drivers/video/broadcom cp /tmp/crystalhd.ko kernel/drivers/video/broadcom -rm /tmp/crystalhd.ko +rm /tmp/crystalhd.ko depmod $kernelVersion popd @@ -88,7 +90,12 @@ cp -f crystalhd/driver/linux/20-crystalhd.rules /lib/udev/rules.d/ popd +rm -rf crystalhd + pushd . rm /root/crystalhd.tar +apt-get -y remove g++ autoconf +apt-get -y autoremove + diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/16-alsaUpgrade xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/16-alsaUpgrade --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/16-alsaUpgrade 2010-09-06 09:01:18.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/16-alsaUpgrade 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2005-2010 Team XBMC -# http://www.xbmc.org -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with XBMC; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html - -echo -echo "Upgrading ALSA..." -echo - -cd /root -pushd . - -apt-get -y install build-essential ncurses-dev gettext xmlto libasound2-dev libncursesw5-dev - -wget --no-proxy -q ftp://ftp.alsa-project.org/pub/driver/alsa-driver-1.0.23.tar.bz2 -wget --no-proxy -q ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.23.tar.bz2 -wget --no-proxy -q ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.23.tar.bz2 - -# -# uname -r gives the host version, we need the chrooted one -# -mv /bin/uname /bin/uname.ori - -cat > /bin/uname << EOF -#!/bin/sh - -if [ "\$1" = "-r" ] ; then - echo \$(ls /lib/modules) -else - /bin/uname.ori \$@ -fi -EOF -chmod +x /bin/uname - -tar xjf alsa-driver* - -cd alsa-driver* -./configure -make -make install - -popd -pushd . - -tar xjf alsa-lib* -cd alsa-lib* -./configure -make -make install - -popd -pushd . - -tar xjf alsa-utils* -cd alsa-utils* -./configure -make -make install - -popd -pushd . - -rm -rf alsa-driver* -rm -rf alsa-lib* -rm -rf alsa-utils* - -# TODO CHECK -# alsaconf - -apt-get -y remove build-essential ncurses-dev gettext xmlto libasound2-dev -apt-get -y remove libncursesw5-dev -apt-get -y autoremove - -dpkg -l | grep ^rc | cut -d' ' -f3|xargs dpkg -P - -rm /bin/uname -mv /bin/uname.ori /bin/uname diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/17-wirelessUpgrade xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/17-wirelessUpgrade --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/17-wirelessUpgrade 2010-09-06 09:01:38.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/17-wirelessUpgrade 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2005-2010 Team XBMC -# http://www.xbmc.org -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with XBMC; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html - -echo -echo "Upgrading wireless drivers..." -echo - -cd /root -pushd . - -wget --no-proxy -q http://www.orbit-lab.org/kernel/compat-wireless-2.6-stable/v2.6.35/compat-wireless-2.6.35-1.tar.bz2 - -# -# uname -r gives the host version, we need the chrooted one -# -mv /bin/uname /bin/uname.ori - -cat > /bin/uname << EOF -#!/bin/sh - -if [ "\$1" = "-r" ] ; then - echo \$(ls /lib/modules) -else - /bin/uname.ori \$@ -fi -EOF -chmod +x /bin/uname - -# -# depmod fails trying the host kernel version, we need the chrooted one -# -mv /sbin/depmod /sbin/depmod.ori - -cat > /sbin/depmod << EOF -#!/bin/sh - -if [ "\$1" = "-a" ] ; then - /sbin/depmod.ori \$(ls /lib/modules) -else - /sbin/depmod.ori \$@ -fi -EOF -chmod +x /sbin/depmod - -# -# modprobe fails trying the host kernel version, we need the chrooted one -# -mv /sbin/modprobe /sbin/modprobe.ori - -cat > /sbin/modprobe << EOF -#!/bin/sh - -/sbin/modprobe.ori --set-version \$(ls /lib/modules) \$@ -EOF -chmod +x /sbin/modprobe - -#need to fake output of lsb_release -i -s to prevent install to fails -sed -i -e "/DISTRIB_ID/s/Ubuntu/Ubuntu__/" /etc/lsb-release - -tar xjf compat-wireless-* - -cd compat-wireless-* -make -make install - -popd -pushd . - -rm -rf compat-wireless-* - -# Clean up all tricks -rm /bin/uname -mv /bin/uname.ori /bin/uname - -rm /sbin/depmod -mv /sbin/depmod.ori /sbin/depmod - -rm /sbin/modprobe -mv /sbin/modprobe.ori /sbin/modprobe - -sed -i -e "/DISTRIB_ID/s/Ubuntu__/Ubuntu/" /etc/lsb-release diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/network/interfaces xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/network/interfaces --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/network/interfaces 2010-06-28 10:00:34.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/network/interfaces 2010-10-06 10:05:09.000000000 +0000 @@ -1,11 +1,8 @@ auto lo iface lo inet loopback -address 127.0.0.1 -netmask 255.0.0.0 - -auto eth0 -iface eth0 inet dhcp +auto eth0 +iface eth0 inet dhcp # WiFi prototype diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/X11.karmic/Xsession.d/90consolekit xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/X11.karmic/Xsession.d/90consolekit --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/X11.karmic/Xsession.d/90consolekit 2010-02-23 15:57:06.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/X11.karmic/Xsession.d/90consolekit 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -# -*- sh -*- -# Xsession.d script for ck-launch-session. -# -# -# This file is sourced by Xsession(5), not executed. - -# -# Rationale: If 'startx' is run from within a text console, ConsoleKit session is not marked 'active' -# Check https://bugs.launchpad.net/ubuntu/+source/consolekit/+bug/483130 -# - - -CK_GET_X11_DISPLAY_DEVICE=/usr/lib/ConsoleKit/ck-get-x11-display-device -CK_LIST_SESSIONS=/usr/bin/ck-list-sessions -CK_LAUNCH_SESSION=/usr/bin/ck-launch-session - -if [ -x "$CK_GET_X11_DISPLAY_DEVICE" -a -x "$CK_LIST_SESSIONS" -a -x "$CK_LAUNCH_SESSION" ] ; then - if [ "$($CK_LIST_SESSIONS | grep "$($CK_GET_X11_DISPLAY_DEVICE)")" = "" ] ; then - STARTUP="$CK_LAUNCH_SESSION $STARTUP" - fi -fi diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/X11.karmic-variant/Xsession.d/90consolekit xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/X11.karmic-variant/Xsession.d/90consolekit --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/X11.karmic-variant/Xsession.d/90consolekit 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/X11.karmic-variant/Xsession.d/90consolekit 2010-02-23 15:57:06.000000000 +0000 @@ -0,0 +1,21 @@ +# -*- sh -*- +# Xsession.d script for ck-launch-session. +# +# +# This file is sourced by Xsession(5), not executed. + +# +# Rationale: If 'startx' is run from within a text console, ConsoleKit session is not marked 'active' +# Check https://bugs.launchpad.net/ubuntu/+source/consolekit/+bug/483130 +# + + +CK_GET_X11_DISPLAY_DEVICE=/usr/lib/ConsoleKit/ck-get-x11-display-device +CK_LIST_SESSIONS=/usr/bin/ck-list-sessions +CK_LAUNCH_SESSION=/usr/bin/ck-launch-session + +if [ -x "$CK_GET_X11_DISPLAY_DEVICE" -a -x "$CK_LIST_SESSIONS" -a -x "$CK_LAUNCH_SESSION" ] ; then + if [ "$($CK_LIST_SESSIONS | grep "$($CK_GET_X11_DISPLAY_DEVICE)")" = "" ] ; then + STARTUP="$CK_LAUNCH_SESSION $STARTUP" + fi +fi diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-packageslists/packages.list.lucid-variant xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-packageslists/packages.list.lucid-variant --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_local-packageslists/packages.list.lucid-variant 2010-08-18 08:27:19.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_local-packageslists/packages.list.lucid-variant 2010-10-05 15:23:39.000000000 +0000 @@ -25,7 +25,7 @@ xbmc-live xbmc plymouth-theme-xbmc-logo -g++ autoconf fglrx fglrx-amdcccle xorg-driver-fglrx nvidia-current libvdpau1 wpasupplicant wireless-tools +linux-backports-modules-alsa-lucid-generic linux-backports-modules-wireless-2.6.35-lucid-generic diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.binary.gpg xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.binary.gpg --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.binary.gpg 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.binary.gpg 2010-09-27 09:24:32.000000000 +0000 @@ -0,0 +1,12 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.0.10 + +mI0ESkrkiQEEALwE5RgqfKnENRKx/kZbjw11VgirFDrCGK5iH/aklsxAsj89kgsdVHlIlBEw +FOOyfXnY01htMH4AX8wC3oI6ojeO2x2mDUJ2YTuyqsWCWJiEYJ9+Mc+s+Bfp014NvUOMZGEB +1spp2NeQ9+ryWpTH2axmElHJobMXC9/bxjC/b1D3ABEBAAG0I0xhdW5jaHBhZCBVYnVudHUg +QXVkaW8gRGV2IHRlYW0gUFBBiLYEEwECACAFAkpK5IkCGwMGCwkIBwMCBBUCCAMEFgIDAQIe +AQIXgAAKCRDSJZkacrGU5Wt+BACjZgZfYIzB9JGi9ftBtul44iYczhqQNOlF+MWcknBD398w +E9AoxHrKXZTiCZtEGWNdChv3Hf1Yxmp/J3g0sgwbWgLI8yFpfZ3cp8kHpQgFNRtcAuuAnxJG +qJQfw4DuAqKYfEXBGpBQHpewMrIVtCRvTzs8/OG/m2yPPYejedNbDw== +=VrmA +-----END PGP PUBLIC KEY BLOCK----- diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.chroot.gpg xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.chroot.gpg --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.chroot.gpg 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.chroot.gpg 2010-09-27 09:24:32.000000000 +0000 @@ -0,0 +1,12 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.0.10 + +mI0ESkrkiQEEALwE5RgqfKnENRKx/kZbjw11VgirFDrCGK5iH/aklsxAsj89kgsdVHlIlBEw +FOOyfXnY01htMH4AX8wC3oI6ojeO2x2mDUJ2YTuyqsWCWJiEYJ9+Mc+s+Bfp014NvUOMZGEB +1spp2NeQ9+ryWpTH2axmElHJobMXC9/bxjC/b1D3ABEBAAG0I0xhdW5jaHBhZCBVYnVudHUg +QXVkaW8gRGV2IHRlYW0gUFBBiLYEEwECACAFAkpK5IkCGwMGCwkIBwMCBBUCCAMEFgIDAQIe +AQIXgAAKCRDSJZkacrGU5Wt+BACjZgZfYIzB9JGi9ftBtul44iYczhqQNOlF+MWcknBD398w +E9AoxHrKXZTiCZtEGWNdChv3Hf1Yxmp/J3g0sgwbWgLI8yFpfZ3cp8kHpQgFNRtcAuuAnxJG +qJQfw4DuAqKYfEXBGpBQHpewMrIVtCRvTzs8/OG/m2yPPYejedNbDw== +=VrmA +-----END PGP PUBLIC KEY BLOCK----- diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.list.binary.lucid-variant xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.list.binary.lucid-variant --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.list.binary.lucid-variant 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.list.binary.lucid-variant 2010-09-27 09:24:32.000000000 +0000 @@ -0,0 +1,2 @@ +deb http://ppa.launchpad.net/ubuntu-audio-dev/ppa/ubuntu lucid main +deb-src http://ppa.launchpad.net/ubuntu-audio-dev/ppa/ubuntu lucid main diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.list.chroot.lucid-variant xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.list.chroot.lucid-variant --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.list.chroot.lucid-variant 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/Files/chroot_sources/audiodev.list.chroot.lucid-variant 2010-09-27 09:24:32.000000000 +0000 @@ -0,0 +1,2 @@ +deb http://ppa.launchpad.net/ubuntu-audio-dev/ppa/ubuntu lucid main +deb-src http://ppa.launchpad.net/ubuntu-audio-dev/ppa/ubuntu karmic main diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/mkConfig.sh.lucid-variant xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/mkConfig.sh.lucid-variant --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildLive/mkConfig.sh.lucid-variant 2010-04-09 14:20:38.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildLive/mkConfig.sh.lucid-variant 2010-09-29 07:42:54.000000000 +0000 @@ -24,6 +24,7 @@ configString="" configString="$configString --mode ubuntu" configString="$configString --distribution lucid" + configString="$configString --architecture i386" configString="$configString --mirror-chroot-security http://security.ubuntu.com/ubuntu/" configString="$configString --mirror-binary-security http://security.ubuntu.com/ubuntu/" configString="$configString --binary-images iso" diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/build.sh xbmc-10.00~svn34731/tools/XBMCLive/SDK/build.sh --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/build.sh 2010-08-20 14:52:34.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/build.sh 2010-09-14 15:43:15.000000000 +0000 @@ -97,9 +97,13 @@ if [ ! -d live-build ]; then if [ ! -f live-build.tar ]; then git clone git://live.debian.net/git/live-build.git - if [ "$?" -ne "0" ]; then + pushd live-build > /dev/null + git checkout -b 2.0_a22-1 debian/2.0_a22-1 + if [ "$?" -ne "0" ]; then exit 1 fi + popd > /dev/null + # Saved, to avoid cloning for multiple builds tar cf live-build.tar live-build > /dev/null 2>&1 diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildWithOptions.sh xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildWithOptions.sh --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/buildWithOptions.sh 2010-08-20 15:32:23.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/buildWithOptions.sh 2010-09-21 14:41:50.000000000 +0000 @@ -24,7 +24,7 @@ # getopt-parse.bash -TEMP=$(getopt -o snp:ulkgiv:h:x --long xbmc-svn,nvidia-only,proxy:,usb-image,live-only,keep-workarea,grub2,intel-only,variant:,hook:,x-swat -- "$@") +TEMP=$(getopt -o snp:ulkgiv:h:xP --long xbmc-svn,nvidia-only,proxy:,usb-image,live-only,keep-workarea,grub2,intel-only,variant:,hook:,x-swat,proposed -- "$@") eval set -- "$TEMP" while true @@ -88,6 +88,11 @@ export SDK_BUILDHOOKS="$SDK_BUILDHOOKS ./buildHook-xswat.sh" shift ;; + -P|--proposed) + echo "Enable option: Use proposed repository" + export SDK_BUILDHOOKS="$SDK_BUILDHOOKS ./buildHook-proposed.sh" + shift + ;; -p|--proxy) echo "Enable option: Use APT proxy" case "$2" in diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/SDK/copyFiles-crystalhd.sh.lucid-variant xbmc-10.00~svn34731/tools/XBMCLive/SDK/copyFiles-crystalhd.sh.lucid-variant --- xbmc-10.00~svn33778/tools/XBMCLive/SDK/copyFiles-crystalhd.sh.lucid-variant 2010-08-20 09:41:18.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/SDK/copyFiles-crystalhd.sh.lucid-variant 2010-10-05 16:27:20.000000000 +0000 @@ -27,7 +27,7 @@ if ! ls $WORKPATH/crystalhd.tar > /dev/null 2>&1; then cd $WORKPATH - svn checkout http://crystalhd-for-osx.googlecode.com/svn/tags/crystalhd-for-osx-2.0.0/crystalhd + svn checkout http://crystalhd-for-osx.googlecode.com/svn/tags/crystalhd-for-osx-3.8.0/crystalhd if [ "$?" -ne "0" ]; then echo "Error retrieving CrystalHD drivers, exiting..." exit 1 diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/setAlsaVolumes xbmc-10.00~svn34731/tools/XBMCLive/setAlsaVolumes --- xbmc-10.00~svn33778/tools/XBMCLive/setAlsaVolumes 2010-08-17 15:19:22.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/setAlsaVolumes 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -#!/usr/bin/env python -""" - * Copyright (C) 2005-2008 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ -""" - -import sys, subprocess - -gVolumeLevel = "100" - -def runSilent(aCmdline): - process = subprocess.Popen(aCmdline, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE) - stdout_value, stderr_value = process.communicate() - return stdout_value - -if __name__ == '__main__': - if len(sys.argv) > 1: - gVolumeLevel = sys.argv[1] - - print "Setting volumes at " + gVolumeLevel + "%" - - mixerList = runSilent("amixer scontrols") - - arMixers = mixerList.split('\n') - for aMixer in arMixers: - nameStart = aMixer.find("'") - if nameStart>0: - # print "Mixer name=" + aMixer[nameStart:] - output = runSilent("amixer sget " + aMixer[nameStart:]) - if output.find("pvolume") > 0: - output = runSilent("amixer sset " + aMixer[nameStart:] + " " + gVolumeLevel + "% unmute") - if output.find("pswitch") > 0: - output = runSilent("amixer sset " + aMixer[nameStart:] + " unmute") - runSilent("amixer sset Capture nocap") diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/setAlsaVolumes.c xbmc-10.00~svn34731/tools/XBMCLive/setAlsaVolumes.c --- xbmc-10.00~svn33778/tools/XBMCLive/setAlsaVolumes.c 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/setAlsaVolumes.c 2010-10-07 09:07:36.000000000 +0000 @@ -0,0 +1,143 @@ +/* + * Copyright (C) 2005-2010 Team XBMC + * http://www.xbmc.org + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +/* + * Compile with: gcc -lasound -osetAlsaVolumes setAlsaVolumes.c + * (libasound2-dev needed) + */ + +#include +#include +#include +#include + +int main(int argc, char *argv[]) +{ + long volume = 90; + int verbose = 0; + + int err; + snd_mixer_t *handle; + snd_mixer_elem_t *elem; + snd_mixer_selem_id_t *sid; + char *card = "default"; + int aChar; + long min=0, max=0; + + opterr = 0; + + while ((aChar = getopt (argc, argv, "v")) != -1) { + switch (aChar) { + case 'v': + verbose = 1; + printf(" Verbose mode ON\n"); + break; + default: + abort(); + } + } + + if ( optind < argc ) + volume = atol(argv[optind]); + + printf("Setting volumes at %ld%%\n", volume); + + if ((err = snd_mixer_open(&handle, 0)) < 0) { + fprintf(stderr, "Mixer %s open error: %s", card, snd_strerror(err)); + return err; + } + if ((err = snd_mixer_attach(handle, card)) < 0) { + fprintf(stderr, "Mixer attach %s error: %s", card, snd_strerror(err)); + snd_mixer_close(handle); + return err; + } + if( (err=snd_mixer_selem_register(handle,NULL,NULL)) < 0 ){ + fprintf(stderr, "ALSA: snd_mixer_selem_register failed: %d\n",err); + snd_mixer_close(handle); + return err; + } + if( (err=snd_mixer_load(handle)) < 0 ){ + fprintf(stderr, "ALSA: snd_mixer_load failed: %d\n",err); + snd_mixer_close(handle); + return err; + } + + snd_mixer_selem_id_alloca(&sid); + for (elem = snd_mixer_first_elem(handle); elem; elem = snd_mixer_elem_next(elem)) { + snd_mixer_selem_get_id(elem, sid); + + if ( verbose ) { + const char *controlName; + controlName = snd_mixer_selem_id_get_name(sid); + printf("Name = %s\n", controlName); + } + + if (snd_mixer_selem_has_playback_volume(elem)) { + if ( verbose ) + printf(" Has playback volume\n"); + snd_mixer_selem_get_playback_volume_range(elem, &min, &max); + + if( (err=snd_mixer_selem_set_playback_volume_all(elem, volume*max/100)) < 0 ) { + fprintf(stderr, "ALSA: snd_mixer_selem_set_playback_volume_all failed: %d\n",err); + } else { + if ( verbose ) + printf(" ** Volume increased to %ld\n", volume); + } + } + if (snd_mixer_selem_has_playback_switch(elem)) { + if ( verbose ) + printf(" Has playback switch\n"); + + if( (err=snd_mixer_selem_set_playback_switch_all(elem, 1)) < 0 ) { + fprintf(stderr, "ALSA: snd_mixer_selem_set_playback_switch_all failed: %d\n",err); + } else { + if ( verbose ) + printf(" ** Unmuted\n"); + } + } + if (snd_mixer_selem_has_capture_volume(elem)) { + if ( verbose ) + printf(" Has capture volume\n"); + + if( (err=snd_mixer_selem_set_capture_volume_all(elem, 0)) < 0 ) { + fprintf(stderr, "ALSA: snd_mixer_selem_set_capture_volume_all failed: %d\n",err); + } else { + if ( verbose ) + printf(" ** Volume decreased to 0\n"); + } + } + if (snd_mixer_selem_has_capture_switch(elem)) { + if ( verbose ) + printf(" Has capture switch\n"); + + if( (err=snd_mixer_selem_set_capture_switch_all(elem, 0)) < 0 ) { + fprintf(stderr, "ALSA: snd_mixer_selem_set_capture_switch_all failed: %d\n",err); + } else { + if ( verbose ) + printf(" ** Muted\n"); + } + } + } + + snd_mixer_close(handle); + + return 0; +} diff -Nru xbmc-10.00~svn33778/tools/XBMCLive/setAlsaVolumes.py xbmc-10.00~svn34731/tools/XBMCLive/setAlsaVolumes.py --- xbmc-10.00~svn33778/tools/XBMCLive/setAlsaVolumes.py 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/tools/XBMCLive/setAlsaVolumes.py 2010-10-07 09:07:36.000000000 +0000 @@ -0,0 +1,54 @@ +#!/usr/bin/env python +""" + * Copyright (C) 2005-2008 Team XBMC + * http://www.xbmc.org + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ +""" + +import sys, subprocess + +gVolumeLevel = "90" + +def runSilent(aCmdline): + process = subprocess.Popen(aCmdline, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE) + stdout_value, stderr_value = process.communicate() + return stdout_value + +if __name__ == '__main__': + if len(sys.argv) > 1: + gVolumeLevel = sys.argv[1] + + print "Setting volumes at " + gVolumeLevel + "%" + + mixerList = runSilent("amixer scontrols") + + arMixers = mixerList.split('\n') + for aMixer in arMixers: + nameStart = aMixer.find("'") + if nameStart>0: + # print "Mixer name=" + aMixer[nameStart:] + if "Mic" in aMixer[nameStart:]: + output = runSilent("amixer sset " + aMixer[nameStart:] + " mute") + else: + output = runSilent("amixer sget " + aMixer[nameStart:]) + if output.find("pvolume") > 0: + output = runSilent("amixer sset " + aMixer[nameStart:] + " " + gVolumeLevel + "% unmute") + if output.find("pswitch") > 0: + output = runSilent("amixer sset " + aMixer[nameStart:] + " unmute") + runSilent("amixer sset Capture nocap") diff -Nru xbmc-10.00~svn33778/xbmc/AddonDatabase.cpp xbmc-10.00~svn34731/xbmc/AddonDatabase.cpp --- xbmc-10.00~svn33778/xbmc/AddonDatabase.cpp 2010-08-24 08:23:25.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/AddonDatabase.cpp 2010-10-07 20:46:17.000000000 +0000 @@ -51,7 +51,7 @@ m_pDS->exec("CREATE TABLE addon (id integer primary key, type text," "name text, summary text, description text, stars integer," "path text, addonID text, icon text, version text, " - "changelog text, fanart text, author text)\n"); + "changelog text, fanart text, author text, disclaimer text)\n"); CLog::Log(LOGINFO, "create addon index"); m_pDS->exec("CREATE INDEX idxAddon ON addon(addonID)"); @@ -146,6 +146,10 @@ m_pDS->exec("CREATE TABLE addonextra (id integer, key text, value text)\n"); m_pDS->exec("CREATE INDEX idxAddonExtra ON addonextra(id)"); } + if (version < 12) + { + m_pDS->exec("alter table addon add disclaimer text"); + } } catch (...) { @@ -167,16 +171,16 @@ CStdString sql = PrepareSQL("insert into addon (id, type, name, summary," "description, stars, path, icon, changelog, " - "fanart, addonID, version, author)" + "fanart, addonID, version, author, disclaimer)" " values(NULL, '%s', '%s', '%s', '%s', %i," - "'%s', '%s', '%s', '%s', '%s','%s','%s')", + "'%s', '%s', '%s', '%s', '%s','%s','%s','%s')", TranslateType(addon->Type(),false).c_str(), addon->Name().c_str(), addon->Summary().c_str(), addon->Description().c_str(),addon->Stars(), addon->Path().c_str(), addon->Props().icon.c_str(), addon->ChangeLog().c_str(),addon->FanArt().c_str(), addon->ID().c_str(), addon->Version().str.c_str(), - addon->Author().c_str()); + addon->Author().c_str(),addon->Disclaimer().c_str()); m_pDS->exec(sql.c_str()); int idAddon = (int)m_pDS->lastinsertid(); @@ -218,6 +222,29 @@ return false; } +bool CAddonDatabase::GetRepoForAddon(const CStdString& addonID, CStdString& repo) +{ + try + { + if (NULL == m_pDB.get()) return false; + if (NULL == m_pDS2.get()) return false; + + CStdString sql = PrepareSQL("select repo.addonID from repo join addonlinkrepo on repo.id=addonlinkrepo.idRepo join addon on addonlinkrepo.idAddon=addon.id where addon.addonID like '%s'", addonID.c_str()); + m_pDS2->query(sql.c_str()); + if (!m_pDS2->eof()) + { + repo = m_pDS2->fv(0).get_asString(); + m_pDS2->close(); + return true; + } + } + catch (...) + { + CLog::Log(LOGERROR, "%s failed for addon %s", __FUNCTION__, addonID.c_str()); + } + return false; +} + bool CAddonDatabase::GetAddon(int id, AddonPtr& addon) { try @@ -240,6 +267,7 @@ props.icon = m_pDS2->fv("icon").get_asString(); props.fanart = m_pDS2->fv("fanart").get_asString(); props.author = m_pDS2->fv("author").get_asString(); + props.disclaimer = m_pDS2->fv("disclaimer").get_asString(); sql = PrepareSQL("select reason from broken where addonID='%s'",props.id.c_str()); m_pDS2->query(sql.c_str()); if (!m_pDS2->eof()) @@ -320,8 +348,6 @@ CStdString sql = PrepareSQL("delete from repo where id=%i",idRepo); m_pDS->exec(sql.c_str()); - sql = PrepareSQL("delete from broken where addonID in (select addonID from addon join addonlinkrepo on addonlinkrepo.idAddon=addon.id where addonlinkrepo.idRepo=%i)",idRepo); - m_pDS->exec(sql.c_str()); sql = PrepareSQL("delete from addon where id in (select idAddon from addonlinkrepo where idRepo=%i)",idRepo); m_pDS->exec(sql.c_str()); sql = PrepareSQL("delete from addonextra where id in (select idAddon from addonlinkrepo where idRepo=%i)",idRepo); diff -Nru xbmc-10.00~svn33778/xbmc/AddonDatabase.h xbmc-10.00~svn34731/xbmc/AddonDatabase.h --- xbmc-10.00~svn33778/xbmc/AddonDatabase.h 2010-07-18 08:40:52.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/AddonDatabase.h 2010-10-07 20:46:17.000000000 +0000 @@ -36,6 +36,13 @@ bool GetAddon(const CStdString& addonID, ADDON::AddonPtr& addon); bool GetAddons(ADDON::VECADDONS& addons); bool GetAddon(int id, ADDON::AddonPtr& addon); + + /*! \brief Grab the repository from which a given addon came + \param addonID - the id of the addon in question + \param repo [out] - the id of the repository + \return true if a repo was found, false otherwise. + */ + bool GetRepoForAddon(const CStdString& addonID, CStdString& repo); int AddRepository(const CStdString& id, const ADDON::VECADDONS& addons, const CStdString& checksum); void DeleteRepository(const CStdString& id); void DeleteRepository(int id); @@ -91,7 +98,7 @@ protected: virtual bool CreateTables(); virtual bool UpdateOldVersion(int version); - virtual int GetMinVersion() const { return 11; } + virtual int GetMinVersion() const { return 12; } const char *GetDefaultDBName() const { return "Addons"; } }; diff -Nru xbmc-10.00~svn33778/xbmc/addons/Addon.cpp xbmc-10.00~svn34731/xbmc/addons/Addon.cpp --- xbmc-10.00~svn33778/xbmc/addons/Addon.cpp 2010-09-10 06:40:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/addons/Addon.cpp 2010-10-11 21:31:07.000000000 +0000 @@ -223,6 +223,13 @@ return CStdString(out); } +#define EMPTY_IF(x,y) \ + { \ + CStdString fan=CAddonMgr::Get().GetExtValue(metadata->configuration, x); \ + if (fan.Equals("true")) \ + y.Empty(); \ + } + AddonProps::AddonProps(cp_plugin_info_t *props) : id(props->identifier) , version(props->version) @@ -234,6 +241,10 @@ //FIXME only considers the first registered extension for each addon if (props->extensions->ext_point_id) type = TranslateType(props->extensions->ext_point_id); + + icon = "icon.png"; + fanart = CUtil::AddFileToFolder(path, "fanart.jpg"); + changelog = CUtil::AddFileToFolder(path, "changelog.txt"); // Grab more detail from the props... const cp_extension_t *metadata = CAddonMgr::Get().GetExtension(props, "xbmc.addon.metadata"); if (metadata) @@ -243,10 +254,10 @@ disclaimer = CAddonMgr::Get().GetTranslatedString(metadata->configuration, "disclaimer"); license = CAddonMgr::Get().GetExtValue(metadata->configuration, "license"); broken = CAddonMgr::Get().GetExtValue(metadata->configuration, "broken"); + EMPTY_IF("nofanart",fanart) + EMPTY_IF("noicon",icon) + EMPTY_IF("nochangelog",changelog) } - icon = "icon.png"; - fanart = CUtil::AddFileToFolder(path, "fanart.jpg"); - changelog = CUtil::AddFileToFolder(path, "changelog.txt"); } /** diff -Nru xbmc-10.00~svn33778/xbmc/addons/AddonManager.cpp xbmc-10.00~svn34731/xbmc/addons/AddonManager.cpp --- xbmc-10.00~svn33778/xbmc/addons/AddonManager.cpp 2010-09-10 06:40:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/addons/AddonManager.cpp 2010-09-23 21:47:18.000000000 +0000 @@ -277,11 +277,11 @@ return GetAddons(type, addons, enabled); } -bool CAddonMgr::GetAllAddons(VECADDONS &addons, bool enabled /*= true*/) +bool CAddonMgr::GetAllAddons(VECADDONS &addons, bool enabled /*= true*/, bool allowRepos /* = false */) { for (int i = ADDON_UNKNOWN+1; i < ADDON_VIZ_LIBRARY; ++i) { - if (ADDON_REPOSITORY == (TYPE)i) + if (!allowRepos && ADDON_REPOSITORY == (TYPE)i) continue; VECADDONS temp; if (CAddonMgr::Get().GetAddons((TYPE)i, temp, enabled)) @@ -336,7 +336,7 @@ return addons.size() > 0; } -bool CAddonMgr::GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &type/*=ADDON_UNKNOWN*/, bool enabled/*= true*/) +bool CAddonMgr::GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &type/*=ADDON_UNKNOWN*/, bool enabledOnly /*= true*/) { CSingleLock lock(m_critSection); @@ -346,7 +346,9 @@ { addon = GetAddonFromDescriptor(cpaddon); m_cpluff->release_info(m_cp_context, cpaddon); - return NULL != addon.get() && m_database.IsAddonDisabled(addon->ID()) != enabled; + if (addon.get() && enabledOnly && m_database.IsAddonDisabled(addon->ID())) + return false; + return NULL != addon.get(); } if (cpaddon) m_cpluff->release_info(m_cp_context, cpaddon); @@ -477,6 +479,7 @@ case ADDON_SCRIPT_WEATHER: case ADDON_SCRIPT_SUBTITLES: case ADDON_SCRIPT_MODULE: + case ADDON_WEB_INTERFACE: return AddonPtr(new CAddon(addonProps)); case ADDON_SCRAPER_ALBUMS: case ADDON_SCRAPER_ARTISTS: @@ -503,10 +506,10 @@ return AddonPtr(); } -void CAddonMgr::UpdateRepos() +void CAddonMgr::UpdateRepos(bool force) { CSingleLock lock(m_critSection); - if (m_watch.IsRunning() && m_watch.GetElapsedSeconds() < 600) + if (!force && m_watch.IsRunning() && m_watch.GetElapsedSeconds() < 600) return; m_watch.StartZero(); VECADDONS addons; @@ -515,7 +518,7 @@ { RepositoryPtr repo = boost::dynamic_pointer_cast(addons[i]); CDateTime lastUpdate = m_database.GetRepoTimestamp(repo->ID()); - if (!lastUpdate.IsValid() || lastUpdate + CDateTimeSpan(0,6,0,0) < CDateTime::GetCurrentDateTime()) + if (force || !lastUpdate.IsValid() || lastUpdate + CDateTimeSpan(0,6,0,0) < CDateTime::GetCurrentDateTime()) { CLog::Log(LOGDEBUG,"Checking repository %s for updates",repo->Name().c_str()); CJobManager::GetInstance().AddJob(new CRepositoryUpdateJob(repo), NULL); diff -Nru xbmc-10.00~svn33778/xbmc/addons/AddonManager.h xbmc-10.00~svn34731/xbmc/addons/AddonManager.h --- xbmc-10.00~svn33778/xbmc/addons/AddonManager.h 2010-07-17 02:48:15.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/addons/AddonManager.h 2010-09-17 06:49:15.000000000 +0000 @@ -86,10 +86,17 @@ /* Addon access */ bool GetDefault(const TYPE &type, AddonPtr &addon); bool SetDefault(const TYPE &type, const CStdString &addonID); - bool GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &type = ADDON_UNKNOWN, bool enabled = true); + /*! \brief Retrieve a specific addon (of a specific type) + \param id the id of the addon to retrieve. + \param addon [out] the retrieved addon pointer - only use if the function returns true. + \param type type of addon to retrieve - defaults to any type. + \param enabledOnly whether we only want enabled addons - set to false to allow both enabled and disabled addons - defaults to true. + \return true if an addon matching the id of the given type is available and is enabled (if enabledOnly is true). + */ + bool GetAddon(const CStdString &id, AddonPtr &addon, const TYPE &type = ADDON_UNKNOWN, bool enabledOnly = true); bool HasAddons(const TYPE &type, bool enabled = true); bool GetAddons(const TYPE &type, VECADDONS &addons, bool enabled = true); - bool GetAllAddons(VECADDONS &addons, bool enabled = true); + bool GetAllAddons(VECADDONS &addons, bool enabled = true, bool allowRepos = false); /*! \brief Get all addons with available updates \param addons List to fill with all outdated addons \param enabled Whether to get only enabled or disabled addons @@ -105,7 +112,7 @@ const char *GetTranslatedString(const cp_cfg_element_t *root, const char *tag); static AddonPtr AddonFromProps(AddonProps& props); - void UpdateRepos(); + void UpdateRepos(bool force=false); void FindAddons(); void RemoveAddon(const CStdString& ID); diff -Nru xbmc-10.00~svn33778/xbmc/addons/AddonStatusHandler.cpp xbmc-10.00~svn34731/xbmc/addons/AddonStatusHandler.cpp --- xbmc-10.00~svn33778/xbmc/addons/AddonStatusHandler.cpp 2010-06-08 08:29:49.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/addons/AddonStatusHandler.cpp 2010-10-03 08:38:51.000000000 +0000 @@ -26,6 +26,7 @@ #include "GUIDialogAddonSettings.h" #include "GUIDialogYesNo.h" #include "GUIDialogOK.h" +#include "GUIWindowManager.h" #include "log.h" namespace ADDON diff -Nru xbmc-10.00~svn33778/xbmc/addons/Repository.cpp xbmc-10.00~svn34731/xbmc/addons/Repository.cpp --- xbmc-10.00~svn33778/xbmc/addons/Repository.cpp 2010-07-29 20:48:21.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/addons/Repository.cpp 2010-10-11 21:31:07.000000000 +0000 @@ -29,9 +29,11 @@ #include "FileItem.h" #include "utils/JobManager.h" #include "utils/FileOperationJob.h" +#include "utils/log.h" #include "GUIWindowManager.h" #include "GUIWindowAddonBrowser.h" #include "GUIDialogYesNo.h" +#include "StringUtils.h" using namespace XFILE; using namespace ADDON; @@ -67,6 +69,7 @@ m_info = CAddonMgr::Get().GetExtValue(ext->configuration, "info"); m_datadir = CAddonMgr::Get().GetExtValue(ext->configuration, "datadir"); m_zipped = CAddonMgr::Get().GetExtValue(ext->configuration, "datadir@zip").Equals("true"); + m_hashes = CAddonMgr::Get().GetExtValue(ext->configuration, "hashes").Equals("true"); } } @@ -81,9 +84,16 @@ CStdString CRepository::Checksum() { + if (!m_checksum.IsEmpty()) + return FetchChecksum(m_checksum); + return ""; +} + +CStdString CRepository::FetchChecksum(const CStdString& url) +{ CSingleLock lock(m_critSection); CFile file; - file.Open(m_checksum); + file.Open(url); CStdString checksum; try { @@ -99,6 +109,25 @@ return checksum; } +CStdString CRepository::GetAddonHash(const AddonPtr& addon) +{ + CStdString checksum; + if (m_hashes) + { + checksum = FetchChecksum(addon->Path()+".md5"); + size_t pos = checksum.find_first_of(" \n"); + if (pos != CStdString::npos) + return checksum.Left(pos); + } + return checksum; +} + +#define SET_IF_NOT_EMPTY(x,y) \ + { \ + if (!x.IsEmpty()) \ + x = y; \ + } + VECADDONS CRepository::Parse() { CSingleLock lock(m_critSection); @@ -127,15 +156,16 @@ if (m_zipped) { addon->Props().path = CUtil::AddFileToFolder(m_datadir,addon->ID()+"/"+addon->ID()+"-"+addon->Version().str+".zip"); - addon->Props().icon = CUtil::AddFileToFolder(m_datadir,addon->ID()+"/icon.png"); - addon->Props().changelog = CUtil::AddFileToFolder(m_datadir,addon->ID()+"/changelog-"+addon->Version().str+".txt"); - addon->Props().fanart = CUtil::AddFileToFolder(m_datadir,addon->ID()+"/fanart.jpg"); + SET_IF_NOT_EMPTY(addon->Props().icon,CUtil::AddFileToFolder(m_datadir,addon->ID()+"/icon.png")) + SET_IF_NOT_EMPTY(addon->Props().changelog,CUtil::AddFileToFolder(m_datadir,addon->ID()+"/changelog-"+addon->Version().str+".txt")) + SET_IF_NOT_EMPTY(addon->Props().fanart,CUtil::AddFileToFolder(m_datadir,addon->ID()+"/fanart.jpg")) } else { addon->Props().path = CUtil::AddFileToFolder(m_datadir,addon->ID()+"/"); - addon->Props().changelog = CUtil::AddFileToFolder(m_datadir,addon->ID()+"/changelog.txt"); - addon->Props().fanart = CUtil::AddFileToFolder(m_datadir,addon->ID()+"/fanart.jpg"); + SET_IF_NOT_EMPTY(addon->Props().icon,CUtil::AddFileToFolder(m_datadir,addon->ID()+"/icon.png")) + SET_IF_NOT_EMPTY(addon->Props().changelog,CUtil::AddFileToFolder(m_datadir,addon->ID()+"/changelog.txt")) + SET_IF_NOT_EMPTY(addon->Props().fanart,CUtil::AddFileToFolder(m_datadir,addon->ID()+"/fanart.jpg")) } } } @@ -165,7 +195,10 @@ { if (g_settings.m_bAddonAutoUpdate || addon->Type() >= ADDON_VIZ_LIBRARY) { - CGUIWindowAddonBrowser::AddJob(addons[i]->Path()); + CGUIWindowAddonBrowser* window = (CGUIWindowAddonBrowser*)g_windowManager.GetWindow(WINDOW_ADDON_BROWSER); + if (!window) + return false; + window->AddJob(addons[i]->Path()); } else { @@ -208,7 +241,10 @@ if (idRepo == -1 || !checksum.Equals(reposum)) { addons = repo->Parse(); - database.AddRepository(repo->ID(),addons,reposum); + if (!addons.empty()) + database.AddRepository(repo->ID(),addons,reposum); + else + CLog::Log(LOGERROR,"Repository %s returned no add-ons, listing may have failed",repo->Name().c_str()); } else { diff -Nru xbmc-10.00~svn33778/xbmc/addons/Repository.h xbmc-10.00~svn34731/xbmc/addons/Repository.h --- xbmc-10.00~svn33778/xbmc/addons/Repository.h 2010-06-19 01:39:33.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/addons/Repository.h 2010-09-17 06:47:51.000000000 +0000 @@ -41,14 +41,22 @@ virtual ~CRepository(); CStdString Checksum(); + + /*! \brief Get the md5 hash for an addon. + \param the addon in question. + \return the md5 hash for the given addon, empty if non exists. + */ + CStdString GetAddonHash(const AddonPtr& addon); VECADDONS Parse(); private: + CStdString FetchChecksum(const CStdString& url); CRepository(const CRepository&, const AddonPtr&); CStdString m_info; CStdString m_checksum; CStdString m_datadir; bool m_compressed; // gzipped info xml bool m_zipped; // zipped addons + bool m_hashes; // repo supports hashes. e.g. plugin.i.rule-1.0.5.zip.md5 CCriticalSection m_critSection; }; diff -Nru xbmc-10.00~svn33778/xbmc/addons/Scraper.cpp xbmc-10.00~svn34731/xbmc/addons/Scraper.cpp --- xbmc-10.00~svn33778/xbmc/addons/Scraper.cpp 2010-08-29 06:30:45.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/addons/Scraper.cpp 2010-10-08 17:10:12.000000000 +0000 @@ -148,6 +148,8 @@ { m_pathContent = rhs.m_pathContent; m_persistence = rhs.m_persistence; + m_requiressettings = rhs.m_requiressettings; + m_language = rhs.m_language; } bool CScraper::Supports(const CONTENT_TYPE &content) const @@ -203,7 +205,7 @@ for (int i=0;im_dateTime + m_persistence <= CDateTime::GetUTCDateTime()) + if (items[i]->m_dateTime + m_persistence <= CDateTime::GetCurrentDateTime()) CFile::Delete(items[i]->m_strPath); } } diff -Nru xbmc-10.00~svn33778/xbmc/addons/Visualisation.cpp xbmc-10.00~svn34731/xbmc/addons/Visualisation.cpp --- xbmc-10.00~svn33778/xbmc/addons/Visualisation.cpp 2010-08-16 21:01:51.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/addons/Visualisation.cpp 2010-10-06 11:38:41.000000000 +0000 @@ -455,6 +455,13 @@ bool CVisualisation::IsLocked() { + if (!m_presets.empty()) + { + if (!m_pStruct) + return false; + + return m_pStruct->IsLocked(); + } return false; } diff -Nru xbmc-10.00~svn33778/xbmc/AdvancedSettings.cpp xbmc-10.00~svn34731/xbmc/AdvancedSettings.cpp --- xbmc-10.00~svn33778/xbmc/AdvancedSettings.cpp 2010-09-03 07:02:18.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/AdvancedSettings.cpp 2010-10-09 23:22:25.000000000 +0000 @@ -92,6 +92,8 @@ m_videoNonLinStretchRatio = 0.5f; m_videoAllowLanczos3 = false; m_videoAllowMpeg4VDPAU = false; + m_DXVACheckCompatibility = false; + m_DXVACheckCompatibilityPresent = false; m_musicUseTimeSeeking = true; m_musicTimeSeekForward = 10; @@ -203,7 +205,6 @@ m_bVideoLibraryHideEmptySeries = false; m_bVideoLibraryCleanOnUpdate = false; m_bVideoLibraryExportAutoThumbs = false; - m_bVideoLibraryMyMoviesCategoriesToGenres = false; m_bVideoLibraryImportWatchedState = false; m_bVideoScannerIgnoreErrors = false; @@ -418,6 +419,9 @@ XMLUtils::GetFloat(pElement, "nonlinearstretchratio", m_videoNonLinStretchRatio, 0.01f, 1.0f); XMLUtils::GetBoolean(pElement,"allowlanczos3",m_videoAllowLanczos3); XMLUtils::GetBoolean(pElement,"allowmpeg4vdpau",m_videoAllowMpeg4VDPAU); + + m_DXVACheckCompatibilityPresent = XMLUtils::GetBoolean(pElement,"checkdxvacompatibility", m_DXVACheckCompatibility); + } pElement = pRootElement->FirstChildElement("musiclibrary"); @@ -445,10 +449,6 @@ XMLUtils::GetString(pElement, "itemseparator", m_videoItemSeparator); XMLUtils::GetBoolean(pElement, "exportautothumbs", m_bVideoLibraryExportAutoThumbs); XMLUtils::GetBoolean(pElement, "importwatchedstate", m_bVideoLibraryImportWatchedState); - - TiXmlElement* pMyMovies = pElement->FirstChildElement("mymovies"); - if (pMyMovies) - XMLUtils::GetBoolean(pMyMovies, "categoriestogenres", m_bVideoLibraryMyMoviesCategoriesToGenres); } pElement = pRootElement->FirstChildElement("videoscanner"); diff -Nru xbmc-10.00~svn33778/xbmc/AdvancedSettings.h xbmc-10.00~svn34731/xbmc/AdvancedSettings.h --- xbmc-10.00~svn33778/xbmc/AdvancedSettings.h 2010-09-03 07:02:18.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/AdvancedSettings.h 2010-10-09 23:22:25.000000000 +0000 @@ -109,6 +109,8 @@ float m_videoNonLinStretchRatio; bool m_videoAllowLanczos3; bool m_videoAllowMpeg4VDPAU; + bool m_DXVACheckCompatibility; + bool m_DXVACheckCompatibilityPresent; CStdString m_videoDefaultPlayer; CStdString m_videoDefaultDVDPlayer; @@ -196,7 +198,6 @@ bool m_bVideoLibraryHideEmptySeries; bool m_bVideoLibraryCleanOnUpdate; bool m_bVideoLibraryExportAutoThumbs; - bool m_bVideoLibraryMyMoviesCategoriesToGenres; bool m_bVideoLibraryImportWatchedState; bool m_bVideoScannerIgnoreErrors; diff -Nru xbmc-10.00~svn33778/xbmc/APEv2Tag.cpp xbmc-10.00~svn34731/xbmc/APEv2Tag.cpp --- xbmc-10.00~svn33778/xbmc/APEv2Tag.cpp 2010-09-13 23:32:01.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/APEv2Tag.cpp 2010-09-29 20:06:17.000000000 +0000 @@ -20,10 +20,38 @@ */ #include "APEv2Tag.h" +#include "FileSystem/File.h" +using namespace XFILE; + +struct _ape_file_io +{ + size_t (*read_func) (void *ptr, size_t size, size_t nmemb, void *datasource); + int (*seek_func) (void *datasource, long int offset, int whence); + long (*tell_func) (void *datasource); + void *data; +}; using namespace MUSIC_INFO; +size_t CAPEv2Tag::fread_callback(void *ptr, size_t size, size_t nmemb, void *fp) +{ + CFile *file = (CFile *)fp; + return file->Read(ptr, size * nmemb) / size; +} + +int CAPEv2Tag::fseek_callback(void *fp, long int offset, int whence) +{ + CFile *file = (CFile *)fp; + return (file->Seek(offset, whence) >= 0) ? 0 : -1; +} + +long CAPEv2Tag::ftell_callback(void *fp) +{ + CFile *file = (CFile *)fp; + return file->GetPosition(); +} + CAPEv2Tag::CAPEv2Tag() { m_nTrackNum = 0; @@ -43,7 +71,20 @@ // Read in our tag using our dll apetag *tag = m_dll.apetag_init(); - m_dll.apetag_read(tag, (char*)filename, 0); + + CFile file; + if (!file.Open(filename)) + return false; + + // Create our file reading class + ape_file file_api; + memset(&file_api, 0, sizeof(ape_file)); + file_api.read_func = fread_callback; + file_api.seek_func = fseek_callback; + file_api.tell_func = ftell_callback; + file_api.data = &file; + + m_dll.apetag_read_fp(tag, &file_api, (char *)filename, 0); if (!tag) return false; diff -Nru xbmc-10.00~svn33778/xbmc/APEv2Tag.h xbmc-10.00~svn34731/xbmc/APEv2Tag.h --- xbmc-10.00~svn33778/xbmc/APEv2Tag.h 2010-01-22 07:22:36.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/APEv2Tag.h 2010-09-29 20:06:17.000000000 +0000 @@ -54,6 +54,11 @@ char GetRating() { return m_rating; }; void GetReplayGainFromTag(apetag *tag); const CReplayGain &GetReplayGain() { return m_replayGain; }; + + static size_t fread_callback(void *ptr, size_t size, size_t nmemb, void *fp); + static int fseek_callback(void *fp, long int offset, int whence); + static long ftell_callback(void *fp); + protected: CStdString m_strTitle; CStdString m_strArtist; diff -Nru xbmc-10.00~svn33778/xbmc/Application.cpp xbmc-10.00~svn34731/xbmc/Application.cpp --- xbmc-10.00~svn33778/xbmc/Application.cpp 2010-09-13 18:41:52.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/Application.cpp 2010-10-11 15:15:33.000000000 +0000 @@ -633,6 +633,8 @@ // Create the Mouse, Keyboard, Remote, and Joystick devices // Initialize after loading settings to get joystick deadzone setting g_Mouse.Initialize(); + g_Mouse.SetEnabled(g_guiSettings.GetBool("input.enablemouse")); + g_Keyboard.Initialize(); #if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE) g_RemoteControl.Initialize(); @@ -710,8 +712,6 @@ g_settings.m_ResInfo[iResolution].strMode.c_str()); g_windowManager.Initialize(); - g_Mouse.SetEnabled(g_guiSettings.GetBool("input.enablemouse")); - CUtil::InitRandomSeed(); g_mediaManager.Initialize(); @@ -2039,9 +2039,10 @@ g_graphicsContext.Flip(); CTimeUtils::UpdateFrameTime(); g_infoManager.UpdateFPS(); - g_renderManager.UpdateResolution(); g_graphicsContext.Unlock(); + g_renderManager.UpdateResolution(); + // yield to other threads, so any thread needing // gfx context will get a timeslice. Newer os's // doesn't automatically prempt the unlocking thread @@ -2356,7 +2357,20 @@ } if (action.IsMouse()) + { + g_Mouse.SetActive(true); m_guiPointer.SetPosition(action.GetAmount(0), action.GetAmount(1)); + } + + // The action PLAYPAUSE behaves as ACTION_PAUSE if we are currently + // playing or ACTION_PLAYER_PLAY if we are not playing. + if (action.GetID() == ACTION_PLAYER_PLAYPAUSE) + { + if (IsPlaying()) + return OnAction(CAction(ACTION_PAUSE)); + else + return OnAction(CAction(ACTION_PLAYER_PLAY)); + } // in normal case // just pass the action to the current window and let it handle it @@ -3341,10 +3355,8 @@ } #endif -#if !defined(_LINUX) g_Windowing.DestroyRenderSystem(); g_Windowing.DestroyWindowSystem(); -#endif CLog::Log(LOGNOTICE, "stopped"); } @@ -4692,7 +4704,8 @@ CheckDelayedPlayerRestart(); // check if we can unload any unreferenced dlls or sections - CSectionLoader::UnloadDelayed(); + if (!IsPlayingVideo()) + CSectionLoader::UnloadDelayed(); // check for any idle curl connections g_curlInterface.CheckIdle(); @@ -4719,11 +4732,13 @@ m_bIsPaused = IsPaused(); } - g_largeTextureManager.CleanupUnusedImages(); + if (!IsPlayingVideo()) + g_largeTextureManager.CleanupUnusedImages(); #ifdef HAS_DVD_DRIVE // checks whats in the DVD drive and tries to autostart the content (xbox games, dvd, cdda, avi files...) - m_Autorun.HandleAutorun(); + if (!IsPlayingVideo()) + m_Autorun.HandleAutorun(); #endif // update upnp server/renderer states @@ -4750,10 +4765,13 @@ #ifdef HAS_LCD // attempt to reinitialize the LCD (e.g. after resuming from sleep) - if (g_lcd && !g_lcd->IsConnected()) + if (!IsPlayingVideo()) { - g_lcd->Stop(); - g_lcd->Initialize(); + if (g_lcd && !g_lcd->IsConnected()) + { + g_lcd->Stop(); + g_lcd->Initialize(); + } } #endif @@ -4999,6 +5017,22 @@ m_pPlayer->ResetTime(); } +void CApplication::StopShutdownTimer() +{ + if (m_shutdownTimer.IsRunning()) + m_shutdownTimer.Stop(); +} + +void CApplication::ResetShutdownTimers() +{ + // reset system shutdown timer + m_shutdownTimer.StartZero(); + + // delete custom shutdown timer + if (g_alarmClock.HasAlarm("shutdowntimer")) + g_alarmClock.Stop("shutdowntimer", true); +} + // Returns the current time in seconds of the currently playing media. // Fractional portions of a second are possible. This returns a double to // be consistent with GetTotalTime() and SeekTime(). diff -Nru xbmc-10.00~svn33778/xbmc/Application.h xbmc-10.00~svn34731/xbmc/Application.h --- xbmc-10.00~svn33778/xbmc/Application.h 2010-08-13 03:25:43.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/Application.h 2010-09-26 21:55:41.000000000 +0000 @@ -191,6 +191,9 @@ void SeekTime( double dTime = 0.0 ); void ResetPlayTime(); + void StopShutdownTimer(); + void ResetShutdownTimers(); + void SaveMusicScanSettings(); void RestoreMusicScanSettings(); void UpdateLibraries(); diff -Nru xbmc-10.00~svn33778/xbmc/ButtonTranslator.cpp xbmc-10.00~svn34731/xbmc/ButtonTranslator.cpp --- xbmc-10.00~svn33778/xbmc/ButtonTranslator.cpp 2010-08-19 20:25:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/ButtonTranslator.cpp 2010-10-06 21:11:22.000000000 +0000 @@ -118,6 +118,7 @@ {"fastforward" , ACTION_PLAYER_FORWARD}, {"rewind" , ACTION_PLAYER_REWIND}, {"play" , ACTION_PLAYER_PLAY}, + {"playpause" , ACTION_PLAYER_PLAYPAUSE}, {"delete" , ACTION_DELETE_ITEM}, {"copy" , ACTION_COPY_ITEM}, {"move" , ACTION_MOVE_ITEM}, @@ -453,6 +454,7 @@ { CLog::Log(LOGINFO, "* Adding remote mapping for device '%s'", szDevice); lircButtonMap buttons; + vector RemoteNames; map::iterator it = lircRemotesMap.find(szDevice); if (it != lircRemotesMap.end()) { @@ -463,12 +465,32 @@ TiXmlElement *pButton = pRemote->FirstChildElement(); while (pButton) { - if (pButton->FirstChild() && pButton->FirstChild()->Value()) - buttons[pButton->FirstChild()->Value()] = pButton->Value(); + if (strcmpi(pButton->Value(), "altname")==0) + RemoteNames.push_back(string(pButton->GetText())); + else + { + if (pButton->FirstChild() && pButton->FirstChild()->Value()) + buttons[pButton->FirstChild()->Value()] = pButton->Value(); + } + pButton = pButton->NextSiblingElement(); } lircRemotesMap[szDevice] = buttons; + vector::iterator itr = RemoteNames.begin(); + while (itr!=RemoteNames.end()) + { + it = lircRemotesMap.find(itr->c_str()); + if (it != lircRemotesMap.end()) + { + buttons = it->second; + lircRemotesMap.erase(it); + } + CLog::Log(LOGINFO, "* Linking remote mapping for '%s' to '%s'", szDevice, itr->c_str()); + lircRemotesMap.insert(it,pair(itr->c_str(),buttons)); + itr++; + } + RemoteNames.clear(); } int CButtonTranslator::TranslateLircRemoteString(const char* szDevice, const char *szButton) diff -Nru xbmc-10.00~svn33778/xbmc/cores/AudioRenderers/ALSADirectSound.cpp xbmc-10.00~svn34731/xbmc/cores/AudioRenderers/ALSADirectSound.cpp --- xbmc-10.00~svn33778/xbmc/cores/AudioRenderers/ALSADirectSound.cpp 2010-05-05 09:33:40.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/AudioRenderers/ALSADirectSound.cpp 2010-09-24 15:13:57.000000000 +0000 @@ -25,6 +25,7 @@ #include "GUISettings.h" #include "utils/log.h" #include "limits.h" +#include "LocalizeStrings.h" #define CHECK_ALSA(l,s,e) if ((e)<0) CLog::Log(l,"%s - %s, alsa error: %d - %s",__FUNCTION__,s,e,snd_strerror(e)); #define CHECK_ALSA_RETURN(l,s,e) CHECK_ALSA((l),(s),(e)); if ((e)<0) return false; @@ -610,7 +611,7 @@ { if (!passthrough) { - vAudioSinks.push_back(AudioSink("default", "alsa:default")); + vAudioSinks.push_back(AudioSink(g_localizeStrings.Get(409), "alsa:default")); vAudioSinks.push_back(AudioSink("iec958" , "alsa:plug:iec958")); vAudioSinks.push_back(AudioSink("hdmi" , "alsa:plug:hdmi")); } @@ -645,7 +646,7 @@ CStdString strCardName = snd_ctl_card_info_get_id( info ); if (!passthrough) - GenSoundLabel(vAudioSinks, "default", strCardName, strReadableCardName); + GenSoundLabel(vAudioSinks, g_localizeStrings.Get(409), strCardName, strReadableCardName); GenSoundLabel(vAudioSinks, "iec958", strCardName, strReadableCardName); GenSoundLabel(vAudioSinks, "hdmi", strCardName, strReadableCardName); } @@ -688,7 +689,7 @@ { CStdString deviceString; deviceString.Format("%s:CARD=%s", sink, card.c_str()); - if (sink.Equals("default") || SoundDeviceExists(deviceString.c_str())) + if (sink.Equals(g_localizeStrings.Get(409)) || SoundDeviceExists(deviceString.c_str())) { CStdString finalSink; finalSink.Format("alsa:%s", deviceString.c_str()); diff -Nru xbmc-10.00~svn33778/xbmc/cores/AudioRenderers/AudioRendererFactory.cpp xbmc-10.00~svn34731/xbmc/cores/AudioRenderers/AudioRendererFactory.cpp --- xbmc-10.00~svn33778/xbmc/cores/AudioRenderers/AudioRendererFactory.cpp 2010-05-11 22:28:05.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/AudioRenderers/AudioRendererFactory.cpp 2010-09-30 23:31:37.000000000 +0000 @@ -90,13 +90,14 @@ CStdString deviceString, device; if (bPassthrough) { +#if defined(_LINUX) && !defined(__APPLE__) deviceString = g_guiSettings.GetString("audiooutput.passthroughdevice"); if (deviceString.Equals("custom")) deviceString = g_guiSettings.GetString("audiooutput.custompassthrough"); - - // some platforms (osx) do not have a separate passthroughdevice setting. - if (deviceString.IsEmpty()) - deviceString = g_guiSettings.GetString("audiooutput.audiodevice"); +#else + // osx/win platforms do not have an "audiooutput.passthroughdevice" setting but can do passthrough + deviceString = g_guiSettings.GetString("audiooutput.audiodevice"); +#endif } else { diff -Nru xbmc-10.00~svn33778/xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp xbmc-10.00~svn34731/xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp --- xbmc-10.00~svn33778/xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp 2010-07-10 02:29:20.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp 2010-09-30 23:34:05.000000000 +0000 @@ -521,7 +521,7 @@ if (!m_Pause) { - CLog::Log(LOGDEBUG, "CoreAudioRenderer::Pause: Pausing Playback."); + //CLog::Log(LOGDEBUG, "CoreAudioRenderer::Pause: Pausing Playback."); if (m_Passthrough) m_AudioDevice.Stop(); else @@ -540,7 +540,7 @@ if (m_Pause) { - CLog::Log(LOGDEBUG, "CoreAudioRenderer::Resume: Resuming Playback."); + //CLog::Log(LOGDEBUG, "CoreAudioRenderer::Resume: Resuming Playback."); if (m_Passthrough) m_AudioDevice.Start(); else @@ -719,11 +719,13 @@ MPSetEvent(m_RunoutEvent, 1); // Tell anyone who cares that the cache is empty if (m_DoRunout) // We were waiting for a runout. This is not an error. { - CLog::Log(LOGDEBUG, "CCoreAudioRenderer::OnRender: Runout complete"); + //CLog::Log(LOGDEBUG, "CCoreAudioRenderer::OnRender: Runout complete"); m_DoRunout = 0; } +/* else CLog::Log(LOGDEBUG, "CCoreAudioRenderer::OnRender: Buffer underrun."); +*/ } // Hard mute for formats that do not allow standard volume control. Throw away any actual data to keep the stream moving. if (!m_EnableVolumeControl && m_CurrentVolume <= VOLUME_MINIMUM) @@ -877,7 +879,7 @@ if (!outputFormat.mFormatID) // No match found { - CLog::Log(LOGERROR, "CoreAudioRenderer::InitializeEncoded: Unable to identify suitable output format."); + CLog::Log(LOGDEBUG, "CoreAudioRenderer::InitializeEncoded: Unable to identify suitable output format."); return false; } diff -Nru xbmc-10.00~svn33778/xbmc/cores/AudioRenderers/PulseAudioDirectSound.cpp xbmc-10.00~svn34731/xbmc/cores/AudioRenderers/PulseAudioDirectSound.cpp --- xbmc-10.00~svn33778/xbmc/cores/AudioRenderers/PulseAudioDirectSound.cpp 2010-09-02 03:24:52.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/AudioRenderers/PulseAudioDirectSound.cpp 2010-09-24 15:13:57.000000000 +0000 @@ -27,6 +27,7 @@ #include "GUISettings.h" #include "utils/log.h" #include "Util.h" +#include "LocalizeStrings.h" static const char *ContextStateToString(pa_context_state s) { @@ -626,7 +627,7 @@ SinkInfoStruct sinkStruct; sinkStruct.mainloop = mainloop; sinkStruct.list = &vAudioSinks; - vAudioSinks.push_back(AudioSink("default", "pulse:default@default")); + vAudioSinks.push_back(AudioSink(g_localizeStrings.Get(409), "pulse:default@default")); WaitForOperation(pa_context_get_sink_info_list(context, SinkInfo, &sinkStruct), mainloop, "EnumerateAudioSinks"); pa_threaded_mainloop_unlock(mainloop); diff -Nru xbmc-10.00~svn33778/xbmc/cores/AudioRenderers/Win32DirectSound.cpp xbmc-10.00~svn34731/xbmc/cores/AudioRenderers/Win32DirectSound.cpp --- xbmc-10.00~svn33778/xbmc/cores/AudioRenderers/Win32DirectSound.cpp 2010-09-06 22:06:09.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/AudioRenderers/Win32DirectSound.cpp 2010-10-01 23:20:09.000000000 +0000 @@ -25,6 +25,7 @@ #include #include #include "SingleLock.h" +#include "SystemInfo.h" #include "utils/log.h" #include "utils/TimeUtils.h" #include "CharsetConverter.h" @@ -166,8 +167,10 @@ dsbdesc.dwSize = sizeof(DSBUFFERDESC); dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 /** Better position accuracy */ | DSBCAPS_GLOBALFOCUS /** Allows background playing */ - | DSBCAPS_CTRLVOLUME /** volume control enabled */ - | DSBCAPS_LOCHARDWARE; /** Needed for 5.1 on emu101k */ + | DSBCAPS_CTRLVOLUME; /** volume control enabled */ + + if (!g_sysinfo.IsVistaOrHigher()) + dsbdesc.dwFlags |= DSBCAPS_LOCHARDWARE; /** Needed for 5.1 on emu101k, always fails on Vista, by design */ dsbdesc.dwBufferBytes = m_dwBufferLen; dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&wfxex; @@ -176,7 +179,7 @@ HRESULT res = IDirectSound_CreateSoundBuffer(m_pDSound, &dsbdesc, &m_pBuffer, NULL); if (res != DS_OK) { - if (dsbdesc.dwFlags & DSBCAPS_LOCHARDWARE) // DSBCAPS_LOCHARDWARE Always fails on Vista, by design + if (dsbdesc.dwFlags & DSBCAPS_LOCHARDWARE) { SAFE_RELEASE(m_pBuffer); CLog::Log(LOGDEBUG, __FUNCTION__": Couldn't create secondary buffer (%s). Trying without LOCHARDWARE.", dserr2str(res)); diff -Nru xbmc-10.00~svn33778/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp xbmc-10.00~svn34731/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp --- xbmc-10.00~svn33778/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp 2010-08-14 11:53:57.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp 2010-10-03 23:33:13.000000000 +0000 @@ -1104,21 +1104,12 @@ if (g_emuFileWrapper.StreamIsEmulatedFile(stream)) { // it is a emulated file - char szString[10]; + unsigned char buf; - if (dll_feof(stream)) - { + if (dll_fread(&buf, 1, 1, stream) <= 0) return EOF; - } - - if (dll_fread(&szString[0], 1, 1, stream) <= 0) - { - return -1; - } - byte byKar = (byte)szString[0]; - int iKar = byKar; - return iKar; + return (int)buf; } else if (!IS_STD_STREAM(stream)) { diff -Nru xbmc-10.00~svn33778/xbmc/cores/DllLoader/Win32DllLoader.cpp xbmc-10.00~svn34731/xbmc/cores/DllLoader/Win32DllLoader.cpp --- xbmc-10.00~svn33778/xbmc/cores/DllLoader/Win32DllLoader.cpp 2010-08-30 21:41:15.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/DllLoader/Win32DllLoader.cpp 2010-10-04 16:10:30.000000000 +0000 @@ -155,23 +155,24 @@ Export win32_python_exports[] = { // these just correct for path separators and call the base - { "access", -1, (void*)xbp_access, NULL }, - { "unlink", -1, (void*)xbp_unlink, NULL }, - { "chmod", -1, (void*)xbp_chmod, NULL }, - { "rmdir", -1, (void*)xbp_rmdir, NULL }, - { "utime", -1, (void*)xbp_utime, NULL }, - { "rename", -1, (void*)xbp_rename, NULL }, - { "mkdir", -1, (void*)xbp_mkdir, NULL }, - { "open", -1, (void*)xbp_open, NULL }, - { "_wfopen", -1, (void*)xbp__wfopen, NULL }, -// { "opendir", -1, (void*)xbp_opendir, NULL }, _LINUX only + { "access", -1, (void*)xbp_access, NULL }, + { "_access", -1, (void*)xbp_access, NULL }, + { "unlink", -1, (void*)xbp_unlink, NULL }, + { "chmod", -1, (void*)xbp_chmod, NULL }, + { "rmdir", -1, (void*)xbp_rmdir, NULL }, + { "utime", -1, (void*)xbp_utime, NULL }, + { "rename", -1, (void*)xbp_rename, NULL }, + { "mkdir", -1, (void*)xbp_mkdir, NULL }, + { "open", -1, (void*)xbp_open, NULL }, + { "_wfopen", -1, (void*)xbp__wfopen, NULL }, +// { "opendir", -1, (void*)xbp_opendir, NULL }, _LINUX only // special workaround just for python - { "_chdir", -1, (void*)xbp_chdir, NULL }, - { "_getcwd", -1, (void*)xbp_getcwd, NULL }, - { "_putenv", -1, (void*)dll_putenv, NULL }, - { "__p__environ", -1, (void*)dll___p__environ, NULL }, - { NULL, -1, NULL, NULL } + { "_chdir", -1, (void*)xbp_chdir, NULL }, + { "_getcwd", -1, (void*)xbp_getcwd, NULL }, + { "_putenv", -1, (void*)dll_putenv, NULL }, + { "__p__environ", -1, (void*)dll___p__environ, NULL }, + { NULL, -1, NULL, NULL } }; Win32DllLoader::Win32DllLoader(const char *dll) : LibraryLoader(dll) diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h 2010-05-25 18:14:56.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/DllAvCodec.h 2010-10-13 00:26:07.000000000 +0000 @@ -135,7 +135,11 @@ static CCriticalSection m_critSection; virtual ~DllAvCodec() {} - virtual void avcodec_register_all() { ::avcodec_register_all(); } + virtual void avcodec_register_all() + { + CSingleLock lock(DllAvCodec::m_critSection); + ::avcodec_register_all(); + } virtual void avcodec_flush_buffers(AVCodecContext *avctx) { ::avcodec_flush_buffers(avctx); } virtual int avcodec_open(AVCodecContext *avctx, AVCodec *codec) { diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg12.c xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg12.c --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg12.c 2010-07-14 06:12:20.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/mpeg12.c 2010-09-29 21:19:28.000000000 +0000 @@ -1940,7 +1940,7 @@ ff_xvmc_field_end(s); /* end of slice reached */ - if (/*s->mb_y<mb_height &&*/ !s->first_field) { + if (/*s->mb_y<mb_height &&*/ !s->first_field && !s->first_slice) { /* end of image */ s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_MPEG2; diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avidec.c xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avidec.c --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avidec.c 2010-07-14 06:13:07.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/avidec.c 2010-09-27 05:27:06.000000000 +0000 @@ -587,6 +587,10 @@ /* Force parsing as several audio frames can be in * one packet and timestamps refer to packet start. */ st->need_parsing = AVSTREAM_PARSE_TIMESTAMPS; + if (st->codec->codec_id == CODEC_ID_DTS) { + st->need_parsing = AVSTREAM_PARSE_FULL; + st->codec->channels = 0; + } /* ADTS header is in extradata, AAC without header must be * stored as exact frames. Parser not needed and it will * fail. */ diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroskadec.c xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroskadec.c --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroskadec.c 2010-07-14 06:12:20.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/matroskadec.c 2010-09-27 05:27:06.000000000 +0000 @@ -1435,6 +1435,10 @@ st->codec->channels = track->audio.channels; if (st->codec->codec_id != CODEC_ID_AAC) st->need_parsing = AVSTREAM_PARSE_HEADERS; + if (st->codec->codec_id == CODEC_ID_DTS) { + st->need_parsing = AVSTREAM_PARSE_FULL; + st->codec->channels = 0; + } } else if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE) { st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; } diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0034-mkv-dca-fix.patch xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0034-mkv-dca-fix.patch --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0034-mkv-dca-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0034-mkv-dca-fix.patch 2010-09-27 09:56:41.000000000 +0000 @@ -0,0 +1,15 @@ +Index: libavformat/matroskadec.c +=================================================================== +--- libavformat/matroskadec.c (revision 24796) ++++ libavformat/matroskadec.c (working copy) +@@ -1435,6 +1435,10 @@ + st->codec->channels = track->audio.channels; + if (st->codec->codec_id != CODEC_ID_AAC) + st->need_parsing = AVSTREAM_PARSE_HEADERS; ++ if (st->codec->codec_id == CODEC_ID_DTS) { ++ st->need_parsing = AVSTREAM_PARSE_FULL; ++ st->codec->channels = 0; ++ } + } else if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE) { + st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; + } diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0035-dts-in-avi-fix.patch xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0035-dts-in-avi-fix.patch --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0035-dts-in-avi-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0035-dts-in-avi-fix.patch 2010-09-27 09:56:41.000000000 +0000 @@ -0,0 +1,15 @@ +Index: libavformat/avidec.c +=================================================================== +--- libavformat/avidec.c (revision 24796) ++++ libavformat/avidec.c (working copy) +@@ -587,6 +587,10 @@ + /* Force parsing as several audio frames can be in + * one packet and timestamps refer to packet start. */ + st->need_parsing = AVSTREAM_PARSE_TIMESTAMPS; ++ if (st->codec->codec_id == CODEC_ID_DTS) { ++ st->need_parsing = AVSTREAM_PARSE_FULL; ++ st->codec->channels = 0; ++ } + /* ADTS header is in extradata, AAC without header must be + * stored as exact frames. Parser not needed and it will + * fail. */ diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp 2010-08-04 08:22:59.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp 2010-10-01 18:02:16.000000000 +0000 @@ -38,6 +38,7 @@ memset(m_pBuffer2, 0, AVCODEC_MAX_AUDIO_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); m_iBuffered = 0; + m_channels = 0; m_pCodecContext = NULL; m_pConvert = NULL; m_bOpenedCodec = false; @@ -76,6 +77,7 @@ if (pCodec->capabilities & CODEC_CAP_TRUNCATED) m_pCodecContext->flags |= CODEC_FLAG_TRUNCATED; + m_channels = 0; m_pCodecContext->channels = hints.channels; m_pCodecContext->sample_rate = hints.samplerate; m_pCodecContext->block_align = hints.blockalign; @@ -102,7 +104,6 @@ return false; } - m_iMapChannels = -1; m_bOpenedCodec = true; m_iSampleFormat = SAMPLE_FMT_NONE; return true; @@ -225,8 +226,9 @@ int CDVDAudioCodecFFmpeg::GetChannels() { - if (m_pCodecContext) return m_pCodecContext->channels; - return 0; + if (m_channels != m_pCodecContext->channels) + BuildChannelMap(); + return m_channels; } int CDVDAudioCodecFFmpeg::GetSampleRate() @@ -240,150 +242,55 @@ return 16; } +static unsigned count_bits(unsigned value) +{ + unsigned bits = 0; + for(;value;++bits) + value &= value - 1; + return bits; +} + void CDVDAudioCodecFFmpeg::BuildChannelMap() { - int index; - int bits; int layout; - /* count the number of bits in the channel_layout */ - layout = m_pCodecContext->channel_layout; - for(bits = 0; layout; ++bits) - layout &= layout - 1; - - /* take a copy of the channel layout */ - layout = m_pCodecContext->channel_layout; - - /* if no layout was specified */ - if (layout == 0 && m_pCodecContext->channels > 0) + int bits = count_bits(m_pCodecContext->channel_layout); + if (bits == m_pCodecContext->channels) + layout = m_pCodecContext->channel_layout; + else { - CLog::Log(LOGINFO, "CDVDAudioCodecFFmpeg::GetChannelMap - FFmpeg did not report a channel layout, trying to guess"); + CLog::Log(LOGINFO, "CDVDAudioCodecFFmpeg::GetChannelMap - FFmpeg reported %d channels, but the layout contains %d ignoring", m_pCodecContext->channels, bits); layout = m_dllAvCodec.avcodec_guess_channel_layout(m_pCodecContext->channels, m_pCodecContext->codec_id, NULL); - bits = m_pCodecContext->channels; } - else - /* if there are more bits set then there are channels */ - if (bits > m_pCodecContext->channels) { - CLog::Log(LOGINFO, "CDVDAudioCodecFFmpeg::GetChannelMap - FFmpeg only reported %d channels, but the layout contains %d, trying to fix", m_pCodecContext->channels, bits); - /* if it is DTS */ - if (m_pCodecContext->codec_id == CODEC_ID_DTS) - { - /* for some reason some DTS files report 5 channels when there is actually 6 */ - m_pCodecContext->channels = bits; - } - } - - if (bits >= m_pCodecContext->channels) - { - index = 0; - if (layout & CH_FRONT_LEFT ) m_channelMap[index++] = PCM_FRONT_LEFT ; - if (layout & CH_FRONT_RIGHT ) m_channelMap[index++] = PCM_FRONT_RIGHT ; - if (layout & CH_FRONT_CENTER ) m_channelMap[index++] = PCM_FRONT_CENTER ; - if (layout & CH_LOW_FREQUENCY ) m_channelMap[index++] = PCM_LOW_FREQUENCY ; - if (layout & CH_BACK_LEFT ) m_channelMap[index++] = PCM_BACK_LEFT ; - if (layout & CH_BACK_RIGHT ) m_channelMap[index++] = PCM_BACK_RIGHT ; - if (layout & CH_FRONT_LEFT_OF_CENTER ) m_channelMap[index++] = PCM_FRONT_LEFT_OF_CENTER ; - if (layout & CH_FRONT_RIGHT_OF_CENTER) m_channelMap[index++] = PCM_FRONT_RIGHT_OF_CENTER; - if (layout & CH_BACK_CENTER ) m_channelMap[index++] = PCM_BACK_CENTER ; - if (layout & CH_SIDE_LEFT ) m_channelMap[index++] = PCM_SIDE_LEFT ; - if (layout & CH_SIDE_RIGHT ) m_channelMap[index++] = PCM_SIDE_RIGHT ; - if (layout & CH_TOP_CENTER ) m_channelMap[index++] = PCM_TOP_CENTER ; - if (layout & CH_TOP_FRONT_LEFT ) m_channelMap[index++] = PCM_TOP_FRONT_LEFT ; - if (layout & CH_TOP_FRONT_CENTER ) m_channelMap[index++] = PCM_TOP_FRONT_CENTER ; - if (layout & CH_TOP_FRONT_RIGHT ) m_channelMap[index++] = PCM_TOP_FRONT_RIGHT ; - if (layout & CH_TOP_BACK_LEFT ) m_channelMap[index++] = PCM_TOP_BACK_LEFT ; - if (layout & CH_TOP_BACK_CENTER ) m_channelMap[index++] = PCM_TOP_BACK_CENTER ; - if (layout & CH_TOP_BACK_RIGHT ) m_channelMap[index++] = PCM_TOP_BACK_RIGHT ; - } else - /* if there is less channels in the map then advertised, we need to fix it */ - if (bits < m_pCodecContext->channels) - { - CLog::Log(LOGINFO, "CDVDAudioCodecFFmpeg::GetChannelMap - FFmpeg did not repot the channel layout properly, trying to guess (%d, %d, %d)", bits, m_pCodecContext->channels, m_pCodecContext->channel_layout); - - index = 0; - switch(m_pCodecContext->codec_id) - { - case CODEC_ID_FLAC: - switch(m_pCodecContext->channels) - { - case 1: - m_channelMap[index++] = PCM_FRONT_CENTER; - break; - - case 2: - m_channelMap[index++] = PCM_FRONT_LEFT; - m_channelMap[index++] = PCM_FRONT_RIGHT; - break; - - case 3: - m_channelMap[index++] = PCM_FRONT_LEFT; - m_channelMap[index++] = PCM_FRONT_RIGHT; - m_channelMap[index++] = PCM_FRONT_CENTER; - break; - - case 4: - m_channelMap[index++] = PCM_FRONT_LEFT; - m_channelMap[index++] = PCM_FRONT_RIGHT; - m_channelMap[index++] = PCM_BACK_LEFT; - m_channelMap[index++] = PCM_BACK_RIGHT; - break; - - case 5: - m_channelMap[index++] = PCM_FRONT_LEFT; - m_channelMap[index++] = PCM_FRONT_RIGHT; - m_channelMap[index++] = PCM_FRONT_CENTER; - m_channelMap[index++] = PCM_BACK_LEFT; - m_channelMap[index++] = PCM_BACK_RIGHT; - break; - - case 6: - m_channelMap[index++] = PCM_FRONT_LEFT; - m_channelMap[index++] = PCM_FRONT_RIGHT; - m_channelMap[index++] = PCM_FRONT_CENTER; - m_channelMap[index++] = PCM_LOW_FREQUENCY; - m_channelMap[index++] = PCM_BACK_LEFT; - m_channelMap[index++] = PCM_BACK_RIGHT; - break; - - case 7: - m_channelMap[index++] = PCM_FRONT_LEFT; - m_channelMap[index++] = PCM_FRONT_RIGHT; - m_channelMap[index++] = PCM_FRONT_CENTER; - m_channelMap[index++] = PCM_BACK_LEFT; - m_channelMap[index++] = PCM_BACK_RIGHT; - m_channelMap[index++] = PCM_SIDE_LEFT; - m_channelMap[index++] = PCM_SIDE_RIGHT; - break; - - case 8: - m_channelMap[index++] = PCM_FRONT_LEFT; - m_channelMap[index++] = PCM_FRONT_RIGHT; - m_channelMap[index++] = PCM_FRONT_CENTER; - m_channelMap[index++] = PCM_LOW_FREQUENCY; - m_channelMap[index++] = PCM_BACK_LEFT; - m_channelMap[index++] = PCM_BACK_RIGHT; - m_channelMap[index++] = PCM_SIDE_LEFT; - m_channelMap[index++] = PCM_SIDE_RIGHT; - break; - } - break; - - default:; - } - - if (index == 0) - CLog::Log(LOGERROR, "CDVDAudioCodecFFmpeg::GetChannelMap - Unable to guess a channel layout, please report this to XBMC and submit a sample file"); - } + int index = 0; + if (layout & CH_FRONT_LEFT ) m_channelMap[index++] = PCM_FRONT_LEFT ; + if (layout & CH_FRONT_RIGHT ) m_channelMap[index++] = PCM_FRONT_RIGHT ; + if (layout & CH_FRONT_CENTER ) m_channelMap[index++] = PCM_FRONT_CENTER ; + if (layout & CH_LOW_FREQUENCY ) m_channelMap[index++] = PCM_LOW_FREQUENCY ; + if (layout & CH_BACK_LEFT ) m_channelMap[index++] = PCM_BACK_LEFT ; + if (layout & CH_BACK_RIGHT ) m_channelMap[index++] = PCM_BACK_RIGHT ; + if (layout & CH_FRONT_LEFT_OF_CENTER ) m_channelMap[index++] = PCM_FRONT_LEFT_OF_CENTER ; + if (layout & CH_FRONT_RIGHT_OF_CENTER) m_channelMap[index++] = PCM_FRONT_RIGHT_OF_CENTER; + if (layout & CH_BACK_CENTER ) m_channelMap[index++] = PCM_BACK_CENTER ; + if (layout & CH_SIDE_LEFT ) m_channelMap[index++] = PCM_SIDE_LEFT ; + if (layout & CH_SIDE_RIGHT ) m_channelMap[index++] = PCM_SIDE_RIGHT ; + if (layout & CH_TOP_CENTER ) m_channelMap[index++] = PCM_TOP_CENTER ; + if (layout & CH_TOP_FRONT_LEFT ) m_channelMap[index++] = PCM_TOP_FRONT_LEFT ; + if (layout & CH_TOP_FRONT_CENTER ) m_channelMap[index++] = PCM_TOP_FRONT_CENTER ; + if (layout & CH_TOP_FRONT_RIGHT ) m_channelMap[index++] = PCM_TOP_FRONT_RIGHT ; + if (layout & CH_TOP_BACK_LEFT ) m_channelMap[index++] = PCM_TOP_BACK_LEFT ; + if (layout & CH_TOP_BACK_CENTER ) m_channelMap[index++] = PCM_TOP_BACK_CENTER ; + if (layout & CH_TOP_BACK_RIGHT ) m_channelMap[index++] = PCM_TOP_BACK_RIGHT ; //terminate the channel map m_channelMap[index] = PCM_INVALID; - m_iMapChannels = GetChannels(); + m_channels = m_pCodecContext->channels; } enum PCMChannels* CDVDAudioCodecFFmpeg::GetChannelMap() { - if (m_iMapChannels != GetChannels()) + if (m_channels != m_pCodecContext->channels) BuildChannelMap(); if (m_channelMap[0] == PCM_INVALID) return NULL; diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h 2010-02-12 22:12:32.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h 2010-10-01 18:02:16.000000000 +0000 @@ -47,7 +47,6 @@ AVAudioConvert* m_pConvert;; enum SampleFormat m_iSampleFormat; enum PCMChannels m_channelMap[PCM_MAX_CH + 1]; - int m_iMapChannels; BYTE *m_pBuffer1; int m_iBufferSize1; @@ -57,6 +56,7 @@ bool m_bOpenedCodec; int m_iBuffered; + int m_channels; DllAvCodec m_dllAvCodec; DllAvUtil m_dllAvUtil; diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp 2010-08-25 00:57:56.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp 2010-09-26 18:26:33.000000000 +0000 @@ -184,14 +184,25 @@ #endif #if defined(HAVE_LIBCRYSTALHD) - if (hint.width > 720 && CCrystalHD::GetInstance()->DevicePresent()) + if (!hint.software && g_guiSettings.GetBool("videoplayer.usechd")) { - if (g_guiSettings.GetBool("videoplayer.usechd") && !hint.software) + if (CCrystalHD::GetInstance()->DevicePresent()) { - if (hint.codec == CODEC_ID_VC1 || hint.codec == CODEC_ID_H264 || hint.codec == CODEC_ID_MPEG2VIDEO) + switch(hint.codec) { - CLog::Log(LOGINFO, "Trying Broadcom Crystal HD Decoder..."); - if ( (pCodec = OpenCodec(new CDVDVideoCodecCrystalHD(), hint, options)) ) return pCodec; + case CODEC_ID_VC1: + case CODEC_ID_H264: + case CODEC_ID_WMV3: + case CODEC_ID_MPEG2VIDEO: + if (hint.codec == CODEC_ID_H264 && hint.ptsinvalid) + break; + if (hint.codec == CODEC_ID_MPEG2VIDEO && hint.width <= 720) + break; + CLog::Log(LOGINFO, "Trying Broadcom Crystal HD Decoder..."); + if ( (pCodec = OpenCodec(new CDVDVideoCodecCrystalHD(), hint, options)) ) return pCodec; + break; + default: + break; } } } diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2010-08-21 02:48:13.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp 2010-10-11 15:13:24.000000000 +0000 @@ -32,6 +32,7 @@ #include "DVDClock.h" #include "DynamicDll.h" +#include "utils/SystemInfo.h" #include "utils/Atomics.h" #include "utils/Thread.h" #include "utils/log.h" @@ -243,7 +244,6 @@ double m_framerate; int m_aspectratio_x; int m_aspectratio_y; - CPictureBuffer *m_interlace_buf; CEvent m_ready_event; DllSwScale *m_dllSwScale; struct SwsContext *m_sw_scale_ctx; @@ -330,8 +330,7 @@ m_framerate_tracking(false), m_framerate_cnt(0), m_framerate_timestamp(0.0), - m_framerate(0.0), - m_interlace_buf(NULL) + m_framerate(0.0) { m_sw_scale_ctx = NULL; m_dllSwScale = new DllSwScale; @@ -345,9 +344,6 @@ while(m_FreeList.Count()) delete m_FreeList.Pop(); - if (m_interlace_buf) - delete m_interlace_buf; - if (m_sw_scale_ctx) m_dllSwScale->sws_freeContext(m_sw_scale_ctx); delete m_dllSwScale; @@ -389,6 +385,7 @@ { double framerate; + m_framerate_timestamp += duration; framerate = DVD_TIME_BASE / duration; // qualify framerate, we don't care about absolute value, just // want to to verify range. Timestamp could be borked so ignore @@ -405,7 +402,6 @@ case 30: case 25: case 24: - m_framerate_timestamp += duration; m_framerate_cnt++; m_framerate = DVD_TIME_BASE / (m_framerate_timestamp/m_framerate_cnt); break; @@ -758,6 +754,7 @@ if (m_format_valid && (procOut.PoutFlags & BCM::BC_POUT_FLAGS_PIB_VALID)) { if (procOut.PicInfo.timeStamp && + m_timestamp != procOut.PicInfo.timeStamp && m_width == (int)procOut.PicInfo.width && m_height == (int)procOut.PicInfo.height) { @@ -767,6 +764,10 @@ if (m_framerate_tracking) DoFrameRateTracking((double)m_timestamp / 1000.0); + // do not let FreeList to get greater than 10 + if (m_FreeList.Count() > 10) + delete m_FreeList.Pop(); + // Get next output buffer from the free list pBuffer = m_FreeList.Pop(); if (!pBuffer) @@ -781,7 +782,9 @@ else pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_NV12, m_width, m_height); #endif - //CLog::Log(LOGDEBUG, "%s: Added a new Buffer, ReadyListCount: %d", __MODULE_NAME__, m_ReadyList.Count()); + CLog::Log(LOGDEBUG, "%s: Added a new Buffer, ReadyListCount: %d", __MODULE_NAME__, m_ReadyList.Count()); + while (!m_bStop && m_ReadyList.Count() > 10) + Sleep(1); } pBuffer->m_width = m_width; @@ -905,6 +908,7 @@ } m_width = procOut.PicInfo.width; m_height = procOut.PicInfo.height; + m_timestamp = DVD_NOPTS_VALUE; m_color_space = procOut.b422Mode; m_color_range = 0; m_color_matrix = procOut.PicInfo.colour_primaries; @@ -913,7 +917,6 @@ if (procOut.PicInfo.flags & VDEC_FLAG_INTERLACED_SRC) { m_interlace = true; - m_interlace_buf = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height); } m_timeout = 2000; m_format_valid = true; @@ -1003,6 +1006,7 @@ CCrystalHD::CCrystalHD() : m_device(NULL), + m_device_preset(false), m_new_lib(false), m_decoder_open(false), m_has_bcm70015(false), @@ -1046,6 +1050,11 @@ m_dll = NULL; CLog::Log(LOGDEBUG, "%s: broadcom crystal hd not found", __MODULE_NAME__); } + else + { + // we know there's a device present now, close the device until doing playback + CloseDevice(); + } } @@ -1064,21 +1073,7 @@ bool CCrystalHD::DevicePresent(void) { - return m_device != NULL; -} - -bool CCrystalHD::Wake(void) -{ - CLog::Log(LOGDEBUG, "%s: resume", __MODULE_NAME__); - //GetInstance(); - return true; -} - -bool CCrystalHD::Sleep(void) -{ - CLog::Log(LOGDEBUG, "%s: suspend", __MODULE_NAME__); - //RemoveInstance(); - return true; + return m_device_preset; } void CCrystalHD::RemoveInstance(void) @@ -1118,6 +1113,7 @@ CLog::Log(LOGDEBUG, "%s: device owned by another application", __MODULE_NAME__); else CLog::Log(LOGDEBUG, "%s: device open failed , returning(0x%x)", __MODULE_NAME__, res); + m_device_preset = false; } else { @@ -1129,6 +1125,7 @@ #else CLog::Log(LOGDEBUG, "%s: device opened", __MODULE_NAME__); #endif + m_device_preset = true; } } @@ -1150,11 +1147,15 @@ BCM::BC_MEDIA_SUBTYPE Subtype; #endif - if (!m_device) + if (!m_device_preset) return false; if (m_decoder_open) CloseDecoder(); + + OpenDevice(); + if (!m_device) + return false; uint32_t videoAlg = 0; switch (codec_type) @@ -1170,6 +1171,8 @@ m_convert_bitstream = false; break; case CRYSTALHD_CODEC_ID_WMV3: + if (!m_has_bcm70015) + return false; videoAlg = BCM::BC_VID_ALGO_VC1MP; StreamType = BCM::BC_STREAM_TYPE_ES; m_convert_bitstream = false; @@ -1200,8 +1203,8 @@ #if (HAVE_LIBCRYSTALHD == 2) uint8_t *pMetaData = NULL; uint32_t metaDataSz = 0; - uint32_t startCodeSz = 0; - m_avcc_params.sps_pps_buf = NULL; + uint32_t startCodeSz = 4; + m_chd_params.sps_pps_buf = NULL; switch (codec_type) { case CRYSTALHD_CODEC_ID_VC1: @@ -1221,21 +1224,20 @@ Subtype = BCM::BC_MSUBTYPE_H264; pMetaData = (uint8_t*)hints.extradata; metaDataSz = hints.extrasize; - startCodeSz = 4; break; case CRYSTALHD_CODEC_ID_AVC1: Subtype = BCM::BC_MSUBTYPE_AVC1; - m_avcc_params.sps_pps_buf = (uint8_t*)malloc(1000); + m_chd_params.sps_pps_buf = (uint8_t*)malloc(1000); if (!extract_sps_pps_from_avcc(hints.extrasize, hints.extradata)) { - free(m_avcc_params.sps_pps_buf); - m_avcc_params.sps_pps_buf = NULL; + free(m_chd_params.sps_pps_buf); + m_chd_params.sps_pps_buf = NULL; } else { - pMetaData = m_avcc_params.sps_pps_buf; - metaDataSz = m_avcc_params.pps_size; - startCodeSz = m_avcc_params.nal_size_bytes; + pMetaData = m_chd_params.sps_pps_buf; + metaDataSz = m_chd_params.sps_pps_size; + startCodeSz = m_chd_params.nal_size_bytes; } break; case CRYSTALHD_CODEC_ID_MPEG2: @@ -1250,19 +1252,6 @@ do { - if (m_has_bcm70015) - { - // bcm70015 quirk - m_dll->DtsOpenDecoder(m_device, StreamType); - m_dll->DtsCloseDecoder(m_device); - } - res = m_dll->DtsOpenDecoder(m_device, StreamType); - if (res != BCM::BC_STS_SUCCESS) - { - CLog::Log(LOGERROR, "%s: open decoder failed", __MODULE_NAME__); - break; - } - #if (HAVE_LIBCRYSTALHD == 2) if (m_new_lib) { @@ -1282,11 +1271,15 @@ bcm_input_format.pMetaData = pMetaData; bcm_input_format.metaDataSz = metaDataSz; bcm_input_format.startCodeSz = startCodeSz; - if (bcm_input_format.metaDataSz > 0) - bcm_input_format.MetaDataEnable = TRUE; - else - bcm_input_format.MetaDataEnable = FALSE; +#if defined(__APPLE__) + if (g_sysinfo.IsAppleTV() && bcm_input_format.width > 1280) + { + bcm_input_format.bEnableScaling = m_has_bcm70015; + bcm_input_format.ScalingParams.sWidth = 1280; + bcm_input_format.ScalingParams.sHeight = 0; + } +#endif res = m_dll->DtsSetInputFormat(m_device, &bcm_input_format); if (res != BCM::BC_STS_SUCCESS) { @@ -1294,6 +1287,13 @@ break; } + res = m_dll->DtsOpenDecoder(m_device, StreamType); + if (res != BCM::BC_STS_SUCCESS) + { + CLog::Log(LOGERROR, "%s: open decoder failed", __MODULE_NAME__); + break; + } + if (m_has_bcm70015) res = m_dll->DtsSetColorSpace(m_device, BCM::OUTPUT_MODE422_YUY2); else @@ -1303,23 +1303,17 @@ CLog::Log(LOGERROR, "%s: set color space failed", __MODULE_NAME__); break; } -/* - BCM::BC_SCALING_PARAMS bc_scale_params; - memset(&bc_scale_params, 0, sizeof(BCM::BC_SCALING_PARAMS)); - bc_scale_params.sWidth = 600; - bc_scale_params.sHeight = 400; - //bc_scale_params.DNR = ; - res = m_dll->DtsSetScaleParams(m_device, &bc_scale_params); - if (res != BCM::BC_STS_SUCCESS) - { - CLog::Log(LOGDEBUG, "%s: set scale params failed", __MODULE_NAME__); - break; - } -*/ } else #endif { + res = m_dll->DtsOpenDecoder(m_device, StreamType); + if (res != BCM::BC_STS_SUCCESS) + { + CLog::Log(LOGERROR, "%s: open decoder failed", __MODULE_NAME__); + break; + } + uint32_t OptFlags = 0x80000000 | BCM::vdecFrameRate23_97; res = m_dll->DtsSetVideoParams(m_device, videoAlg, FALSE, FALSE, TRUE, OptFlags); if (res != BCM::BC_STS_SUCCESS) @@ -1383,14 +1377,14 @@ } } #if (HAVE_LIBCRYSTALHD == 2) - if (m_avcc_params.sps_pps_buf) + if (m_chd_params.sps_pps_buf) { - free(m_avcc_params.sps_pps_buf); - m_avcc_params.sps_pps_buf = NULL; + free(m_chd_params.sps_pps_buf); + m_chd_params.sps_pps_buf = NULL; } #endif - if (m_device) + if (m_decoder_open) { // DtsFlushRxCapture must release internal queues when // calling DtsStopDecoder/DtsCloseDecoder or the next @@ -1401,8 +1395,10 @@ m_dll->DtsFlushRxCapture(m_device, false); m_dll->DtsStopDecoder(m_device); m_dll->DtsCloseDecoder(m_device); + m_decoder_open = false; } - m_decoder_open = false; + + CloseDevice(); } void CCrystalHD::Reset(void) @@ -1469,26 +1465,29 @@ if (free_demuxer_content) free(demuxer_content); - if (m_reset) + if (!m_has_bcm70015) { - m_reset--; - if (!m_skip_state) + if (m_reset) { - m_skip_state = true; - m_dll->DtsSetSkipPictureMode(m_device, 1); + m_reset--; + if (!m_skip_state) + { + m_skip_state = true; + m_dll->DtsSetSkipPictureMode(m_device, 1); + } } - } - else - { - if (m_skip_state) + else { - m_skip_state = false; - m_dll->DtsSetSkipPictureMode(m_device, 0); + if (m_skip_state) + { + m_skip_state = false; + m_dll->DtsSetSkipPictureMode(m_device, 0); + } } } bool wait_state; - if (!m_pOutputThread->GetReadyCount()) + if (m_pOutputThread->GetReadyCount() < 2) wait_state = m_pOutputThread->WaitOutput(m_wait_timeout); } @@ -1592,17 +1591,39 @@ void CCrystalHD::SetDropState(bool bDrop) { - if (!m_has_bcm70015) + if (m_drop_state != bDrop) { - if (m_drop_state != bDrop) - m_drop_state = bDrop; + m_drop_state = bDrop; + + if (!m_has_bcm70015) + { + if (!m_reset) + { + if (m_drop_state) + { + if (!m_skip_state) + { + m_skip_state = true; + m_dll->DtsSetSkipPictureMode(m_device, 1); + Sleep(1); + } + } + else + { + if (m_skip_state) + { + m_skip_state = false; + m_dll->DtsSetSkipPictureMode(m_device, 0); + Sleep(1); + } + } + } + } } - -/* - if (m_drop_state) - CLog::Log(LOGDEBUG, "%s: SetDropState... %d, , GetFreeCount(%d), GetReadyCount(%d), BusyListCount(%d)", __MODULE_NAME__, - m_drop_state, m_pOutputThread->GetFreeCount(), m_pOutputThread->GetReadyCount(), m_BusyList.Count()); -*/ + /* + CLog::Log(LOGDEBUG, "%s: m_drop_state(%d), GetFreeCount(%d), GetReadyCount(%d)", __MODULE_NAME__, + m_drop_state, m_pOutputThread->GetFreeCount(), m_pOutputThread->GetReadyCount()); + */ } //////////////////////////////////////////////////////////////////////////////////////////// bool CCrystalHD::extract_sps_pps_from_avcc(int extradata_size, void *extradata) @@ -1613,14 +1634,14 @@ unsigned int nal_size; unsigned int num_sps, num_pps; - m_avcc_params.pps_size = 0; + m_chd_params.sps_pps_size = 0; profile = (data[1] << 16) | (data[2] << 8) | data[3]; CLog::Log(LOGDEBUG, "%s: profile %06x", __MODULE_NAME__, profile); - m_avcc_params.nal_size_bytes = (data[4] & 0x03) + 1; + m_chd_params.nal_size_bytes = (data[4] & 0x03) + 1; - CLog::Log(LOGDEBUG, "%s: nal size %d", __MODULE_NAME__, m_avcc_params.nal_size_bytes); + CLog::Log(LOGDEBUG, "%s: nal size %d", __MODULE_NAME__, m_chd_params.nal_size_bytes); num_sps = data[5] & 0x1f; CLog::Log(LOGDEBUG, "%s: num sps %d", __MODULE_NAME__, num_sps); @@ -1640,15 +1661,15 @@ if (data_size < nal_size) return false; - m_avcc_params.sps_pps_buf[0] = 0; - m_avcc_params.sps_pps_buf[1] = 0; - m_avcc_params.sps_pps_buf[2] = 0; - m_avcc_params.sps_pps_buf[3] = 1; + m_chd_params.sps_pps_buf[0] = 0; + m_chd_params.sps_pps_buf[1] = 0; + m_chd_params.sps_pps_buf[2] = 0; + m_chd_params.sps_pps_buf[3] = 1; - m_avcc_params.pps_size += 4; + m_chd_params.sps_pps_size += 4; - memcpy(m_avcc_params.sps_pps_buf + m_avcc_params.pps_size, data, nal_size); - m_avcc_params.pps_size += nal_size; + memcpy(m_chd_params.sps_pps_buf + m_chd_params.sps_pps_size, data, nal_size); + m_chd_params.sps_pps_size += nal_size; data += nal_size; data_size -= nal_size; @@ -1673,15 +1694,15 @@ if (data_size < nal_size) return false; - m_avcc_params.sps_pps_buf[m_avcc_params.pps_size+0] = 0; - m_avcc_params.sps_pps_buf[m_avcc_params.pps_size+1] = 0; - m_avcc_params.sps_pps_buf[m_avcc_params.pps_size+2] = 0; - m_avcc_params.sps_pps_buf[m_avcc_params.pps_size+3] = 1; + m_chd_params.sps_pps_buf[m_chd_params.sps_pps_size+0] = 0; + m_chd_params.sps_pps_buf[m_chd_params.sps_pps_size+1] = 0; + m_chd_params.sps_pps_buf[m_chd_params.sps_pps_size+2] = 0; + m_chd_params.sps_pps_buf[m_chd_params.sps_pps_size+3] = 1; - m_avcc_params.pps_size += 4; + m_chd_params.sps_pps_size += 4; - memcpy(m_avcc_params.sps_pps_buf + m_avcc_params.pps_size, data, nal_size); - m_avcc_params.pps_size += nal_size; + memcpy(m_chd_params.sps_pps_buf + m_chd_params.sps_pps_size, data, nal_size); + m_chd_params.sps_pps_size += nal_size; data += nal_size; data_size -= nal_size; diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h 2010-07-11 23:37:53.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h 2010-10-03 23:43:24.000000000 +0000 @@ -111,15 +111,11 @@ #define CRYSTALHD_FIELD_EVEN 0x01 #define CRYSTALHD_FIELD_ODD 0x02 -typedef struct AVCC_PLAY_PARAMS { +typedef struct CHD_CODEC_PARAMS { uint8_t *sps_pps_buf; - uint32_t pps_size; - bool inside_buffer; - uint32_t consumed_offset; - uint32_t strtcode_offset; - uint32_t nal_sz; + uint32_t sps_pps_size; uint8_t nal_size_bytes; -} AVCC_PLAY_PARAMS; +} CHD_CODEC_PARAMS; class DllLibCrystalHD; class CMPCInputThread; @@ -134,8 +130,6 @@ static CCrystalHD* GetInstance(void); bool DevicePresent(void); - bool Wake(void); - bool Sleep(void); void OpenDevice(); void CloseDevice(); @@ -156,6 +150,7 @@ DllLibCrystalHD *m_dll; void *m_device; + bool m_device_preset; bool m_new_lib; bool m_decoder_open; bool m_has_bcm70015; @@ -197,7 +192,7 @@ bool m_convert_bitstream; bool extract_sps_pps_from_avcc(int extradata_size, void *extradata); - AVCC_PLAY_PARAMS m_avcc_params; + CHD_CODEC_PARAMS m_chd_params; }; #endif diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp 2010-08-09 03:55:44.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp 2010-10-13 00:35:05.000000000 +0000 @@ -34,12 +34,13 @@ #include "Settings.h" #include "boost/shared_ptr.hpp" #include "AutoPtrHandle.h" +#include "AdvancedSettings.h" #define ALLOW_ADDING_SURFACES 0 using namespace DXVA; -using namespace boost; using namespace AUTOPTR; +using namespace std; typedef HRESULT (__stdcall *DXVA2CreateVideoServicePtr)(IDirect3DDevice9* pDD, REFIID riid, void** ppService); static DXVA2CreateVideoServicePtr g_DXVA2CreateVideoService; @@ -114,6 +115,22 @@ { NULL, NULL, 0 } }; +// List of PCI Device ID of ATI cards with UVD or UVD+ decoding block. +static DWORD UVDDeviceID [] = { + 0x95C0, // ATI Radeon HD 3400 Series (and others) + 0x95C5, // ATI Radeon HD 3400 Series (and others) + 0x94C3, // ATI Radeon HD 3410 + 0x9589, // ATI Radeon HD 3600 Series (and others) + 0x9598, // ATI Radeon HD 3600 Series (and others) + 0x9591, // ATI Radeon HD 3600 Series (and others) + 0x9501, // ATI Radeon HD 3800 Series (and others) + 0x9505, // ATI Radeon HD 3800 Series (and others) + 0x9507, // ATI Radeon HD 3830 + 0x9513, // ATI Radeon HD 3850 X2 + 0x950F, // ATI Radeon HD 3850 X2 + 0x0000 +}; + static CStdString GUIDToString(const GUID& guid) { CStdString buffer; @@ -135,7 +152,7 @@ } -#define SCOPE(type, var) shared_ptr var##_holder(var, CoTaskMemFree); +#define SCOPE(type, var) boost::shared_ptr var##_holder(var, CoTaskMemFree); CDecoder::SVideoBuffer::SVideoBuffer() { @@ -214,9 +231,58 @@ } \ } while(0); +static bool CheckH264L41(AVCodecContext *avctx) +{ + unsigned widthmbs = (avctx->width + 15) / 16; // width in macroblocks + unsigned heightmbs = (avctx->height + 15) / 16; // height in macroblocks + unsigned maxdpbmbs = 32768; // Decoded Picture Buffer (DPB) capacity in macroblocks for L4.1 + + return (avctx->refs * widthmbs * heightmbs <= maxdpbmbs); +} + +static bool IsL41LimitedATI() +{ + if(g_Windowing.GetAIdentifier().VendorId == PCIV_ATI) + { + for (unsigned idx = 0; UVDDeviceID[idx] != 0; idx++) + { + if (UVDDeviceID[idx] == g_Windowing.GetAIdentifier().DeviceId) + return true; + } + } + return false; +} + +static bool CheckCompatibility(AVCodecContext *avctx) +{ + // Check for hardware limited to H264 L4.1 (ie Bluray). + + if(avctx->codec_id != CODEC_ID_H264) + return true; + + // No advanced settings: autodetect. + // The advanced setting lets the user override the autodetection (in case of false positive or negative) + + bool checkcompat; + if (!g_advancedSettings.m_DXVACheckCompatibilityPresent) + checkcompat = IsL41LimitedATI(); // ATI UVD and UVD+ cards can only do L4.1 - corresponds roughly to series 3xxx + else + checkcompat = g_advancedSettings.m_DXVACheckCompatibility; + + if (checkcompat && !CheckH264L41(avctx)) + { + CLog::Log(LOGDEBUG, "DXVA - compatibility check: video exceeds L4.1. DXVA will not be used."); + return false; + } + + return true; +} bool CDecoder::Open(AVCodecContext *avctx, enum PixelFormat fmt) { + if (!CheckCompatibility(avctx)) + return false; + if(!LoadDXVA()) return false; @@ -416,6 +482,12 @@ if(!OpenDecoder()) return false; + // The front buffer seems to be the only one required and it seems to always be m_buffer[0] on ATI and nVidia + // but how reliable is that information? + // Not adding refs causes a crash at the end of playback because the surfaces are released with the decoder, despite the >0 D3D ref count. + for(unsigned i = 0; i < m_buffer_count; i++) + m_processor->HoldSurface(m_buffer[i].surface); + avctx->get_buffer = GetBufferS; avctx->release_buffer = RelBufferS; avctx->hwaccel_context = m_context; @@ -607,10 +679,6 @@ , m_context->surface_count , &m_decoder)) - // CreateVideoDecoder will not addref the surfaces, but will release them when released - for(unsigned i = 0; i < m_buffer_count; i++) - m_buffer[i].surface->AddRef(); - m_context->decoder = m_decoder; return true; @@ -733,9 +801,10 @@ for(unsigned i = 0; i < m_sample.size(); i++) SAFE_RELEASE(m_sample[i].SrcSurface); m_sample.clear(); + for (vector::iterator it = m_heldsurfaces.begin(); it != m_heldsurfaces.end(); it++) + SAFE_RELEASE(*it); } - bool CProcessor::Open(const DXVA2_VideoDesc& dsc) { if(!LoadDXVA()) @@ -794,9 +863,16 @@ CHECK(m_service->GetProcAmpRange(m_device, &m_desc, output, DXVA2_ProcAmp_Saturation, &m_saturation)); m_time = 0; + return true; } +void CProcessor::HoldSurface(IDirect3DSurface9* surface) +{ + surface->AddRef(); + m_heldsurfaces.push_back(surface); +} + REFERENCE_TIME CProcessor::Add(IDirect3DSurface9* source) { CSingleLock lock(m_section); diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h 2010-07-17 00:36:11.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h 2010-10-13 00:35:47.000000000 +0000 @@ -26,6 +26,8 @@ #include "Event.h" #include #include +#include + namespace DXVA { class CProcessor; @@ -102,9 +104,10 @@ CProcessor(); ~CProcessor(); - bool Open(const DXVA2_VideoDesc& dsc); - void Close(); - REFERENCE_TIME Add (IDirect3DSurface9* source); + bool Open(const DXVA2_VideoDesc& dsc); + void Close(); + void HoldSurface(IDirect3DSurface9* surface); + REFERENCE_TIME Add(IDirect3DSurface9* source); bool Render(const RECT& dst, IDirect3DSurface9* target, const REFERENCE_TIME time); int Size() { return m_size; } @@ -137,6 +140,7 @@ long m_references; protected: + std::vector m_heldsurfaces; }; }; diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2010-09-13 07:48:21.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2010-10-11 22:03:08.000000000 +0000 @@ -271,10 +271,11 @@ iformat = m_dllAvFormat.av_find_input_format("mpegts"); } + // try to abort after 30 seconds + m_timeout = CTimeUtils::GetTimeMS() + 30000; + if( m_pInput->IsStreamType(DVDSTREAM_TYPE_FFMPEG) ) { - m_timeout = CTimeUtils::GetTimeMS() + 10000; - // special stream type that makes avformat handle file opening // allows internal ffmpeg protocols to be used if( m_dllAvFormat.av_open_input_file(&m_pFormatContext, strFile.c_str(), iformat, FFMPEG_FILE_BUFFER_SIZE, NULL) < 0 ) @@ -286,7 +287,6 @@ } else { - m_timeout = 0; unsigned char* buffer = (unsigned char*)m_dllAvUtil.av_malloc(FFMPEG_FILE_BUFFER_SIZE); m_ioContext = m_dllAvFormat.av_alloc_put_byte(buffer, FFMPEG_FILE_BUFFER_SIZE, 0, m_pInput, dvd_file_read, NULL, dvd_file_seek); m_ioContext->max_packet_size = m_pInput->GetBlockSize(); @@ -837,8 +837,10 @@ *startpts = DVD_NOPTS_VALUE; Flush(); - //RTMP did this for some reason - //m_ioContext->buf_ptr = m_ioContext->buf_end; + + // also empty the internal ffmpeg buffer + m_ioContext->buf_ptr = m_ioContext->buf_end; + return true; } @@ -972,7 +974,17 @@ else st->bVFR = false; - if(pStream->r_frame_rate.den && pStream->r_frame_rate.num) + // never trust pts in avi files with h264. + if (m_bAVI && pStream->codec->codec_id == CODEC_ID_H264) + st->bPTSInvalid = true; + + //average fps is more accurate for mkv files + if (m_bMatroska && pStream->avg_frame_rate.den && pStream->avg_frame_rate.num) + { + st->iFpsRate = pStream->avg_frame_rate.num; + st->iFpsScale = pStream->avg_frame_rate.den; + } + else if(pStream->r_frame_rate.den && pStream->r_frame_rate.num) { st->iFpsRate = pStream->r_frame_rate.num; st->iFpsScale = pStream->r_frame_rate.den; @@ -1091,9 +1103,6 @@ memcpy(m_streams[iId]->ExtraData, pStream->codec->extradata, pStream->codec->extradata_size); } - //FFMPEG has an error doesn't set type properly for DTS - if( m_streams[iId]->codec == CODEC_ID_AC3 && (pStream->id >= 136 && pStream->id <= 143) ) - m_streams[iId]->codec = CODEC_ID_DTS; #ifdef HAVE_LIBBLURAY if( m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY) ) static_cast(m_pInput)->GetStreamInfo(pStream->id, m_streams[iId]->language); @@ -1101,6 +1110,11 @@ if( m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) ) { // this stuff is really only valid for dvd's. + + //FFMPEG has an error doesn't set type properly for DTS + if (m_streams[iId]->codec == CODEC_ID_AC3 && (pStream->id >= 136 && pStream->id <= 143)) + m_streams[iId]->codec = CODEC_ID_DTS; + // this is so that the physicalid matches the // id's reported from libdvdnav switch(m_streams[iId]->codec) diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h 2010-05-30 17:42:33.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h 2010-09-25 04:22:41.000000000 +0000 @@ -142,6 +142,7 @@ bVFR = false; iLevel = 0; iProfile = 0; + bPTSInvalid = false; type = STREAM_VIDEO; } @@ -154,6 +155,7 @@ bool bVFR; // variable framerate int iLevel; // encoder level of the stream reported by the decoder. used to qualify hw decoders. int iProfile; // encoder profile of the stream reported by the decoder. used to qualify hw decoders. + bool bPTSInvalid; // pts cannot be trusted (avi's). }; diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDFileInfo.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDFileInfo.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDFileInfo.cpp 2010-09-14 00:46:44.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDFileInfo.cpp 2010-09-30 15:41:12.000000000 +0000 @@ -32,6 +32,7 @@ #include "DVDFileInfo.h" #include "DVDStreamInfo.h" #include "DVDInputStreams/DVDInputStream.h" +#include "DVDInputStreams/DVDInputStreamBluray.h" #include "DVDInputStreams/DVDFactoryInputStream.h" #include "DVDDemuxers/DVDDemux.h" #include "DVDDemuxers/DVDDemuxUtils.h" @@ -118,7 +119,7 @@ } if (pStreamDetails) - DemuxerToStreamDetails(pDemuxer, *pStreamDetails, strPath); + DemuxerToStreamDetails(pInputStream, pDemuxer, *pStreamDetails, strPath); CDemuxStream* pStream = NULL; int nVideoStream = -1; @@ -357,7 +358,7 @@ CDVDDemux *pDemuxer = CDVDFactoryDemuxer::CreateDemuxer(pInputStream); if (pDemuxer) { - bool retVal = DemuxerToStreamDetails(pDemuxer, pItem->GetVideoInfoTag()->m_streamDetails, strFileNameAndPath); + bool retVal = DemuxerToStreamDetails(pInputStream, pDemuxer, pItem->GetVideoInfoTag()->m_streamDetails, strFileNameAndPath); delete pDemuxer; delete pInputStream; return retVal; @@ -370,7 +371,7 @@ } /* returns true if details have been added */ -bool CDVDFileInfo::DemuxerToStreamDetails(CDVDDemux *pDemux, CStreamDetails &details, const CStdString &path) +bool CDVDFileInfo::DemuxerToStreamDetails(CDVDInputStream *pInputStream, CDVDDemux *pDemux, CStreamDetails &details, const CStdString &path) { bool retVal = false; details.Reset(); @@ -437,6 +438,16 @@ } /* for iStream */ details.DetermineBestStreams(); + + // correct bluray runtime. we need the duration from the input stream, not the demuxer. + if (pInputStream->IsStreamType(DVDSTREAM_TYPE_BLURAY)) + { + if(((CDVDInputStreamBluray*)pInputStream)->GetTotalTime() > 0) + { + ((CStreamDetailVideo*)details.GetNthStream(CStreamDetail::VIDEO,0))->m_iDuration = ((CDVDInputStreamBluray*)pInputStream)->GetTotalTime() / 1000; + } + } + return retVal; } diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDFileInfo.h xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDFileInfo.h --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDFileInfo.h 2010-06-04 19:03:13.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDFileInfo.h 2010-09-30 15:41:12.000000000 +0000 @@ -25,6 +25,7 @@ class CFileItem; class CDVDDemux; class CStreamDetails; +class CDVDInputStream; class CDVDFileInfo { @@ -37,7 +38,7 @@ // Probe the files streams and store the info in the VideoInfoTag static bool GetFileStreamDetails(CFileItem *pItem); - static bool DemuxerToStreamDetails(CDVDDemux *pDemux, CStreamDetails &details, const CStdString &path = ""); + static bool DemuxerToStreamDetails(CDVDInputStream* pInputStream, CDVDDemux *pDemux, CStreamDetails &details, const CStdString &path = ""); static bool GetFileDuration(const CStdString &path, int &duration); }; diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp 2010-08-26 23:25:48.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp 2010-09-29 12:08:17.000000000 +0000 @@ -91,6 +91,13 @@ return new CDVDInputStreamMMS(); #endif + //else if (item.IsShoutCast()) + // /* this should be replaced with standard file as soon as ffmpeg can handle raw aac */ + // /* currently ffmpeg isn't able to detect that */ + // return (new CDVDInputStreamHttp()); + //else if (item.IsInternetStream() ) + // return (new CDVDInputStreamHttp()); + // our file interface handles all these types of streams return (new CDVDInputStreamFile()); } diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp 2010-08-18 14:57:37.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp 2010-09-20 09:17:28.000000000 +0000 @@ -316,8 +316,8 @@ // get decoded data and the size of it audioframe.size = m_pAudioCodec->GetData(&audioframe.data); audioframe.pts = m_audioClock; - audioframe.channels = m_pAudioCodec->GetChannels(); audioframe.channel_map = m_pAudioCodec->GetChannelMap(); + audioframe.channels = m_pAudioCodec->GetChannels(); /* get channels AFTER map so that it can be corrected if bad */ audioframe.bits_per_sample = m_pAudioCodec->GetBitsPerSample(); audioframe.sample_rate = m_pAudioCodec->GetSampleRate(); audioframe.passthrough = m_pAudioCodec->NeedPassthrough(); diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDPlayer.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDPlayer.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDPlayer.cpp 2010-09-03 07:01:17.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDPlayer.cpp 2010-10-01 18:02:16.000000000 +0000 @@ -100,6 +100,21 @@ return m_invalid; } +bool CSelectionStreams::Get(StreamType type, CDemuxStream::EFlags flag, SelectionStream& out) +{ + CSingleLock lock(m_section); + for(int i=0;i<(int)m_Streams.size();i++) + { + if(m_Streams[i].type != type) + continue; + if((m_Streams[i].flags & flag) != flag) + continue; + out = m_Streams[i]; + return true; + } + return false; +} + int CSelectionStreams::IndexOf(StreamType type, int source, int id) { CSingleLock lock(m_section); @@ -195,6 +210,7 @@ s.type = STREAM_AUDIO; s.id = i; s.name = nav->GetAudioStreamLanguage(i); + s.flags = CDemuxStream::FLAG_NONE; s.filename = filename; Update(s); } @@ -207,6 +223,7 @@ s.type = STREAM_SUBTITLE; s.id = i; s.name = nav->GetSubtitleStreamLanguage(i); + s.flags = CDemuxStream::FLAG_NONE; s.filename = filename; Update(s); } @@ -233,6 +250,7 @@ s.type = stream->type; s.id = stream->iId; s.language = stream->language; + s.flags = stream->flags; s.filename = demuxer->GetFileName(); stream->GetStreamName(s.name); if(stream->type == STREAM_AUDIO) @@ -433,6 +451,12 @@ // find any available external subtitles std::vector filenames; CDVDFactorySubtitle::GetSubtitles(filenames, m_filename); + + // find any upnp subtitles + CStdString key("upnp:subtitle:1"); + for(unsigned s = 1; m_item.HasProperty(key); key.Format("upnp:subtitle:%u", ++s)) + filenames.push_back(m_item.GetProperty(key)); + for(unsigned int i=0;i= 0 + + // if subs are disabled, check for forced + if(!valid && !g_settings.m_currentVideoSettings.m_SubtitleOn + && m_SelectionStreams.Get(STREAM_SUBTITLE, CDemuxStream::FLAG_FORCED, st)) + { + if(OpenSubtitleStream(st.id, st.source)) + { + valid = true; + force = true; + } + else + CLog::Log(LOGWARNING, "%s - failed to open default/forced stream (%d)", __FUNCTION__, st.id); + } + + // restore selected + if(!valid + && g_settings.m_currentVideoSettings.m_SubtitleStream >= 0 && g_settings.m_currentVideoSettings.m_SubtitleStream < count) { SelectionStream& s = m_SelectionStreams.Get(STREAM_SUBTITLE, g_settings.m_currentVideoSettings.m_SubtitleStream); @@ -543,6 +605,17 @@ CLog::Log(LOGWARNING, "%s - failed to restore selected subtitle stream (%d)", __FUNCTION__, g_settings.m_currentVideoSettings.m_SubtitleStream); } + // select default + if(!valid + && m_SelectionStreams.Get(STREAM_SUBTITLE, CDemuxStream::FLAG_DEFAULT, st)) + { + if(OpenSubtitleStream(st.id, st.source)) + valid = true; + else + CLog::Log(LOGWARNING, "%s - failed to open default/forced stream (%d)", __FUNCTION__, st.id); + } + + // select first for(int i = 0;i 0)) // this is more correct (dvds in particular) { GetVideoAspectRatio(((CStreamDetailVideo*)details.GetNthStream(CStreamDetail::VIDEO,0))->m_fAspect); diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDPlayer.h xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDPlayer.h --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDPlayer.h 2010-08-18 14:57:37.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDPlayer.h 2010-09-19 16:59:13.000000000 +0000 @@ -97,6 +97,7 @@ std::string filename; std::string language; std::string name; + CDemuxStream::EFlags flags; int source; int id; } SelectionStream; @@ -118,6 +119,7 @@ int IndexOf (StreamType type, CDVDPlayer& p); int Count (StreamType type) { return IndexOf(type, STREAM_SOURCE_NONE, -1) + 1; } SelectionStream& Get (StreamType type, int index); + bool Get (StreamType type, CDemuxStream::EFlags flag, SelectionStream& out); void Clear (StreamType type, StreamSource source); int Source (StreamSource source, std::string filename); diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2010-09-06 14:49:02.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp 2010-10-03 23:26:37.000000000 +0000 @@ -450,16 +450,15 @@ //in normal mpegs m_iNrOfPicturesNotToSkip = 5; } - else if( iDropped*frametime > DVD_MSEC_TO_TIME(100) ) + else if( iDropped*frametime > DVD_MSEC_TO_TIME(100) && m_iNrOfPicturesNotToSkip == 0 ) { // if we dropped too many pictures in a row, insert a forced picture - m_iNrOfPicturesNotToSkip++; + m_iNrOfPicturesNotToSkip = 1; } #ifdef PROFILE bRequestDrop = false; #else if (m_messageQueue.GetDataSize() == 0 - || m_iNrOfPicturesNotToSkip > 0 || m_speed < 0) { bRequestDrop = false; @@ -1105,22 +1104,25 @@ // ask decoder to drop frames next round, as we are very late if(m_iLateFrames > 10) { - //if we're calculating the framerate, - //don't drop frames until we've calculated a stable framerate - if (m_bAllowDrop || m_speed != DVD_PLAYSPEED_NORMAL) + if (!(pPicture->iFlags & DVP_FLAG_NOSKIP)) { - result |= EOS_VERYLATE; - m_pullupCorrection.Flush(); //dropped frames mess up the pattern, so just flush it - } + //if we're calculating the framerate, + //don't drop frames until we've calculated a stable framerate + if (m_bAllowDrop || m_speed != DVD_PLAYSPEED_NORMAL) + { + result |= EOS_VERYLATE; + m_pullupCorrection.Flush(); //dropped frames mess up the pattern, so just flush it + } - //if we requested 5 drops in a row and we're still late, drop on output - //this keeps a/v sync if the decoder can't drop, or we're still calculating the framerate - if (m_iDroppedRequest > 5) - { - m_iDroppedRequest--; //decrease so we only drop half the frames - return result | EOS_DROPPED; + //if we requested 5 drops in a row and we're still late, drop on output + //this keeps a/v sync if the decoder can't drop, or we're still calculating the framerate + if (m_iDroppedRequest > 5) + { + m_iDroppedRequest--; //decrease so we only drop half the frames + return result | EOS_DROPPED; + } + m_iDroppedRequest++; } - m_iDroppedRequest++; } else { diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDStreamInfo.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDStreamInfo.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDStreamInfo.cpp 2010-07-13 19:54:21.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDStreamInfo.cpp 2010-09-25 04:22:41.000000000 +0000 @@ -58,6 +58,7 @@ stills = false; level = 0; profile = 0; + ptsinvalid = false; channels = 0; samplerate = 0; @@ -92,6 +93,7 @@ || stills != right.stills || level != right.level || profile != right.profile + || ptsinvalid != right.profile || vfr != right.vfr) return false; // AUDIO @@ -145,6 +147,7 @@ stills = right.stills; level = right.level; profile = right.profile; + ptsinvalid = right.ptsinvalid; // AUDIO channels = right.channels; @@ -192,6 +195,7 @@ vfr = stream->bVFR; level = stream->iLevel; profile = stream->iProfile; + ptsinvalid = stream->bPTSInvalid; } else if( right.type == STREAM_SUBTITLE ) { diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDStreamInfo.h xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDStreamInfo.h --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/DVDStreamInfo.h 2010-07-13 19:54:21.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/DVDStreamInfo.h 2010-09-25 04:22:41.000000000 +0000 @@ -75,6 +75,7 @@ bool stills; // there may be odd still frames in video int level; // encoder level of the stream reported by the decoder. used to qualify hw decoders. int profile; // encoder profile of the stream reported by the decoder. used to qualify hw decoders. + bool ptsinvalid; // pts cannot be trusted (avi's). // AUDIO int channels; diff -Nru xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Edl.cpp xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Edl.cpp --- xbmc-10.00~svn33778/xbmc/cores/dvdplayer/Edl.cpp 2010-06-29 19:56:55.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/dvdplayer/Edl.cpp 2010-09-23 18:22:58.000000000 +0000 @@ -74,31 +74,34 @@ * * Adjust the frame rate using the detected frame rate or height to determine typical interlaced * content (obtained from http://en.wikipedia.org/wiki/Frame_rate) + * + * Note that this is a HACK and we should be able to get the frame rate from the source sending + * back frame markers. However, this doesn't seem possible for MythTV. */ float fFramesPerSecond; - if (fFrameRate == 59.940f) // NTSC or 60i content + if (int(fFrameRate * 100) == 5994) // 59.940 fps = NTSC or 60i content { - CLog::Log(LOGDEBUG, "%s - Adjusting frames per second from 59.940 to 29.97 assuming NTSC or 60i (interlaced)", - __FUNCTION__); - fFramesPerSecond = 29.97f; + fFramesPerSecond = fFrameRate / 2; // ~29.97f - division used to retain accuracy of original. + CLog::Log(LOGDEBUG, "%s - Assuming NTSC or 60i interlaced content. Adjusted frames per second from %.3f (~59.940 fps) to %.3f", + __FUNCTION__, fFrameRate, fFramesPerSecond); } - else if (fFrameRate == 47.952f) // 24p -> NTSC conversion + else if (int(fFrameRate * 100) == 4795) // 47.952 fps = 24p -> NTSC conversion { - CLog::Log(LOGDEBUG, "%s - Adjusting frames per second from 47.952 to 23.976 assuming 24p -> NTSC conversion (interlaced)", - __FUNCTION__); - fFramesPerSecond = 23.976f; + fFramesPerSecond = fFrameRate / 2; // ~23.976f - division used to retain accuracy of original. + CLog::Log(LOGDEBUG, "%s - Assuming 24p -> NTSC conversion interlaced content. Adjusted frames per second from %.3f (~47.952 fps) to %.3f", + __FUNCTION__, fFrameRate, fFramesPerSecond); } else if (iHeight == 576) // PAL. Can't used fps check of 50.0 as this is valid for 720p { - CLog::Log(LOGDEBUG, "%s - Setting frames per second to 25.0 assuming PAL (interlaced)", - __FUNCTION__); - fFramesPerSecond = 25.0f; + fFramesPerSecond = fFrameRate / 2; // ~25.0f - division used to retain accuracy of original. + CLog::Log(LOGDEBUG, "%s - Assuming PAL interlaced content. Adjusted frames per second from %.3f (~50.00 fps) to %.3f", + __FUNCTION__, fFrameRate, fFramesPerSecond); } else if (iHeight == 1080) // Don't know of any 1080p content being broadcast so assume 1080i { - CLog::Log(LOGDEBUG, "%s - Adjusting detected frame rate by half assuming 1080i (interlaced): %.3f", - __FUNCTION__, fFrameRate); fFramesPerSecond = fFrameRate / 2; + CLog::Log(LOGDEBUG, "%s - Assuming 1080i interlaced content. Adjusted frames per second from %.3f to %.3f", + __FUNCTION__, fFrameRate, fFramesPerSecond); } else // Assume everything else is not interlaced, e.g. 720p. fFramesPerSecond = fFrameRate; @@ -179,8 +182,8 @@ continue; Cut cut; - cut.start = (int)dStart * 1000; // ms to s - cut.end = (int)dEnd * 1000; // ms to s + cut.start = (int64_t)(dStart * 1000); // seconds to ms + cut.end = (int64_t)(dEnd * 1000); // seconds to ms switch (iAction) { @@ -370,7 +373,7 @@ int iScene; double dSceneMarker; if (sscanf(szBuffer + strlen(VIDEOREDO_TAG_SCENE), " %i>%lf", &iScene, &dSceneMarker) == 2) - bValid = AddSceneMarker((int)dSceneMarker / 10000); // Times need adjusting by 1/10,000 to get ms. + bValid = AddSceneMarker((int64_t)(dSceneMarker / 10000)); // Times need adjusting by 1/10,000 to get ms. else bValid = false; } @@ -820,8 +823,8 @@ Cut cut; cut.action = COMM_BREAK; - cut.start = (int)(commbreak->start_mark / fFramesPerSecond * 1000); - cut.end = (int)(commbreak->end_mark / fFramesPerSecond * 1000); + cut.start = (int64_t)(commbreak->start_mark / fFramesPerSecond * 1000); + cut.end = (int64_t)(commbreak->end_mark / fFramesPerSecond * 1000); if (!AddCut(cut)) // Log and continue with errors while still testing. CLog::Log(LOGERROR, "%s - Invalid commercial break [%s - %s] found in MythTV for: %s. Continuing anyway.", diff -Nru xbmc-10.00~svn33778/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp xbmc-10.00~svn34731/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp --- xbmc-10.00~svn33778/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp 2010-05-16 13:25:41.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp 2010-10-04 05:05:44.000000000 +0000 @@ -337,6 +337,7 @@ { CLog::Log(LOGNOTICE, "%s: Showing XBMC window TOPMOST", __FUNCTION__); SetWindowPos(g_hWnd,HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE|SWP_SHOWWINDOW); + SetForegroundWindow(g_hWnd); } else #endif diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/CodecFactory.cpp xbmc-10.00~svn34731/xbmc/cores/paplayer/CodecFactory.cpp --- xbmc-10.00~svn33778/xbmc/cores/paplayer/CodecFactory.cpp 2010-08-26 22:30:03.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/CodecFactory.cpp 2010-10-04 17:48:26.000000000 +0000 @@ -34,7 +34,6 @@ #ifdef HAS_SPC_CODEC #include "SPCCodec.h" #endif -#include "GYMCodec.h" #include "SIDCodec.h" #include "VGMCodec.h" #include "YMCodec.h" @@ -105,8 +104,6 @@ else if (strFileType.Equals("spc")) return new SPCCodec(); #endif - else if (strFileType.Equals("gym")) - return new GYMCodec(); else if (strFileType.Equals("sid") || strFileType.Equals("sidstream")) return new SIDCodec(); else if (VGMCodec::IsSupportedFormat(strFileType)) @@ -134,7 +131,8 @@ ICodec* CodecFactory::CreateCodecDemux(const CStdString& strFile, const CStdString& strContent, unsigned int filecache) { CURL urlFile(strFile); - if( strContent.Equals("audio/mpeg") ) + if( strContent.Equals("audio/mpeg") + || strContent.Equals("audio/mp3") ) return new MP3Codec(); else if( strContent.Equals("audio/aac") || strContent.Equals("audio/aacp") ) diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/DllGensApu.h xbmc-10.00~svn34731/xbmc/cores/paplayer/DllGensApu.h --- xbmc-10.00~svn33778/xbmc/cores/paplayer/DllGensApu.h 2008-07-23 15:08:22.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/DllGensApu.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -#pragma once - -/* - * Copyright (C) 2005-2008 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -#include "DynamicDll.h" - -class DllGensApuInterface -{ -public: - virtual ~DllGensApuInterface() {} - virtual int Init()=0; - virtual int LoadGYM(const char* szFileName)=0; - virtual void FreeGYM(int gym)=0; - virtual int FillBuffer(int gym, void* buffer)=0; - virtual void Seek(int gym, unsigned int iPos)=0; - virtual int GetTitle(int spc)=0; - virtual int GetArtist(int spc)=0; - virtual __int64 GetLength(int gym)=0; -}; - -class DllGensApu : public DllDynamic, DllGensApuInterface -{ - DECLARE_DLL_WRAPPER(DllGensApu, DLL_PATH_GYM_CODEC) - DEFINE_METHOD0(int, Init) - DEFINE_METHOD1(int, LoadGYM, (const char* p1)) - DEFINE_METHOD1(void, FreeGYM, (int p1)) - DEFINE_METHOD2(int, FillBuffer, (int p1, void* p2)) - DEFINE_METHOD2(void, Seek, (int p1, unsigned int p2)) - DEFINE_METHOD1(int, GetTitle, (int p1)) - DEFINE_METHOD1(int, GetArtist, (int p1)) - DEFINE_METHOD1(__int64, GetLength, (int p1)) - BEGIN_METHOD_RESOLVE() - RESOLVE_METHOD_RENAME(DLL_Init, Init) - RESOLVE_METHOD_RENAME(DLL_LoadGYM, LoadGYM) - RESOLVE_METHOD_RENAME(DLL_FreeGYM, FreeGYM) - RESOLVE_METHOD_RENAME(DLL_FillBuffer, FillBuffer) - RESOLVE_METHOD_RENAME(DLL_Seek, Seek) - RESOLVE_METHOD_RENAME(DLL_GetTitle, GetTitle) - RESOLVE_METHOD_RENAME(DLL_GetArtist, GetArtist) - RESOLVE_METHOD_RENAME(DLL_GetLength, GetLength) - END_METHOD_RESOLVE() -}; diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/DllNosefart.h xbmc-10.00~svn34731/xbmc/cores/paplayer/DllNosefart.h --- xbmc-10.00~svn33778/xbmc/cores/paplayer/DllNosefart.h 2008-07-23 15:08:22.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/DllNosefart.h 2010-10-04 17:49:31.000000000 +0000 @@ -27,29 +27,29 @@ { public: virtual ~DllNosefartInterface() {} - virtual int LoadNSF(const char* szFileName)=0; - virtual void FreeNSF(int)=0; - virtual int StartPlayback(int nsf, int track)=0; - virtual long FillBuffer(int nsf, char* buffer, int size)=0; - virtual void FrameAdvance(int nsf)=0; - virtual int GetPlaybackRate(int nsf)=0; - virtual int GetNumberOfSongs(int nsf)=0; - virtual int GetTitle(int nsf)=0; - virtual int GetArtist(int nsf)=0; + virtual void* LoadNSF(const char* szFileName)=0; + virtual void FreeNSF(void*)=0; + virtual int StartPlayback(void* nsf, int track)=0; + virtual long FillBuffer(void* nsf, char* buffer, int size)=0; + virtual void FrameAdvance(void* nsf)=0; + virtual int GetPlaybackRate(void* nsf)=0; + virtual int GetNumberOfSongs(void* nsf)=0; + virtual char* GetTitle(void* nsf)=0; + virtual char* GetArtist(void* nsf)=0; }; class DllNosefart : public DllDynamic, DllNosefartInterface { DECLARE_DLL_WRAPPER(DllNosefart, DLL_PATH_NSF_CODEC) - DEFINE_METHOD1(int, LoadNSF, (const char* p1)) - DEFINE_METHOD1(void, FreeNSF, (int p1)) - DEFINE_METHOD2(int, StartPlayback, (int p1, int p2)) - DEFINE_METHOD3(long, FillBuffer, (int p1, char* p2, int p3)) - DEFINE_METHOD1(void, FrameAdvance, (int p1)) - DEFINE_METHOD1(int, GetPlaybackRate, (int p1)) - DEFINE_METHOD1(int, GetNumberOfSongs, (int p1)) - DEFINE_METHOD1(int, GetTitle, (int p1)) - DEFINE_METHOD1(int, GetArtist, (int p1)) + DEFINE_METHOD1(void*, LoadNSF, (const char* p1)) + DEFINE_METHOD1(void, FreeNSF, (void* p1)) + DEFINE_METHOD2(int, StartPlayback, (void* p1, int p2)) + DEFINE_METHOD3(long, FillBuffer, (void* p1, char* p2, int p3)) + DEFINE_METHOD1(void, FrameAdvance, (void* p1)) + DEFINE_METHOD1(int, GetPlaybackRate, (void* p1)) + DEFINE_METHOD1(int, GetNumberOfSongs, (void* p1)) + DEFINE_METHOD1(char*, GetTitle, (void* p1)) + DEFINE_METHOD1(char*, GetArtist, (void* p1)) BEGIN_METHOD_RESOLVE() RESOLVE_METHOD_RENAME(DLL_LoadNSF, LoadNSF) RESOLVE_METHOD_RENAME(DLL_FreeNSF, FreeNSF) diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/DllSidplay2.h xbmc-10.00~svn34731/xbmc/cores/paplayer/DllSidplay2.h --- xbmc-10.00~svn33778/xbmc/cores/paplayer/DllSidplay2.h 2008-07-23 15:08:22.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/DllSidplay2.h 2010-09-23 20:34:59.000000000 +0000 @@ -28,24 +28,24 @@ public: virtual ~DllSidplay2Interface() {} virtual int Init()=0; - virtual int LoadSID(const char* szFileName)=0; - virtual void FreeSID(int sid)=0; - virtual void StartPlayback(int sid, int track)=0; - virtual int FillBuffer(int sid, void* buffer, int length)=0; + virtual void* LoadSID(const char* szFileName)=0; + virtual void FreeSID(void* sid)=0; + virtual void StartPlayback(void* sid, int track)=0; + virtual int FillBuffer(void* sid, void* buffer, int length)=0; virtual int GetNumberOfSongs(const char* szFileName)=0; - virtual void SetSpeed(int sid, int speed)=0; + virtual void SetSpeed(void* sid, int speed)=0; }; class DllSidplay2 : public DllDynamic, DllSidplay2Interface { DECLARE_DLL_WRAPPER(DllSidplay2, DLL_PATH_SID_CODEC) DEFINE_METHOD0(int, Init) - DEFINE_METHOD1(int, LoadSID, (const char* p1)) - DEFINE_METHOD1(void, FreeSID, (int p1)) - DEFINE_METHOD2(void, StartPlayback,(int p1, int p2)) - DEFINE_METHOD3(int, FillBuffer, (int p1, void* p2, int p3)) + DEFINE_METHOD1(void*, LoadSID, (const char* p1)) + DEFINE_METHOD1(void, FreeSID, (void* p1)) + DEFINE_METHOD2(void, StartPlayback,(void* p1, int p2)) + DEFINE_METHOD3(int, FillBuffer, (void* p1, void* p2, int p3)) DEFINE_METHOD1(int, GetNumberOfSongs, (const char* p1)) - DEFINE_METHOD2(void, SetSpeed, (int p1, int p2)) + DEFINE_METHOD2(void, SetSpeed, (void* p1, int p2)) BEGIN_METHOD_RESOLVE() RESOLVE_METHOD_RENAME(DLL_Init, Init) RESOLVE_METHOD_RENAME(DLL_LoadSID, LoadSID) diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/DllStSound.h xbmc-10.00~svn34731/xbmc/cores/paplayer/DllStSound.h --- xbmc-10.00~svn33778/xbmc/cores/paplayer/DllStSound.h 2008-07-23 15:08:22.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/DllStSound.h 2010-10-04 17:46:47.000000000 +0000 @@ -27,25 +27,25 @@ { public: virtual ~DllStSoundInterface() {} - virtual int LoadYM(const char* szFileName)=0; - virtual void FreeYM(int ym)=0; - virtual int FillBuffer(int ym, char* buffer, unsigned long length)=0; - virtual unsigned long Seek(int ym, unsigned long iTimePos)=0; - virtual const char* GetTitle(int ym)=0; - virtual const char* GetArtist(int ym)=0; - virtual unsigned long GetLength(int ym)=0; + virtual void* LoadYM(const char* szFileName)=0; + virtual void FreeYM(void* ym)=0; + virtual int FillBuffer(void* ym, char* buffer, unsigned long length)=0; + virtual unsigned long Seek(void* ym, unsigned long iTimePos)=0; + virtual const char* GetTitle(void* ym)=0; + virtual const char* GetArtist(void* ym)=0; + virtual unsigned long GetLength(void* ym)=0; }; class DllStSound : public DllDynamic, DllStSoundInterface { DECLARE_DLL_WRAPPER(DllStSound, DLL_PATH_YM_CODEC) - DEFINE_METHOD1(int, LoadYM, (const char* p1)) - DEFINE_METHOD1(void, FreeYM, (int p1)) - DEFINE_METHOD3(int, FillBuffer, (int p1, char* p2, unsigned long p3)) - DEFINE_METHOD2(unsigned long, Seek, (int p1, unsigned long p2)) - DEFINE_METHOD1(const char*, GetTitle, (int p1)) - DEFINE_METHOD1(const char*, GetArtist, (int p1)) - DEFINE_METHOD1(unsigned long, GetLength, (int p1)) + DEFINE_METHOD1(void*, LoadYM, (const char* p1)) + DEFINE_METHOD1(void, FreeYM, (void* p1)) + DEFINE_METHOD3(int, FillBuffer, (void* p1, char* p2, unsigned long p3)) + DEFINE_METHOD2(unsigned long, Seek, (void* p1, unsigned long p2)) + DEFINE_METHOD1(const char*, GetTitle, (void* p1)) + DEFINE_METHOD1(const char*, GetArtist, (void* p1)) + DEFINE_METHOD1(unsigned long, GetLength, (void* p1)) BEGIN_METHOD_RESOLVE() RESOLVE_METHOD_RENAME(DLL_LoadYM, LoadYM) RESOLVE_METHOD_RENAME(DLL_FreeYM, FreeYM) diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/gensapu.sln xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/gensapu.sln --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/gensapu.sln 2007-08-01 10:48:20.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/gensapu.sln 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensapu", "gensapu.vcproj", "{60D5F6A6-8D2E-4040-8728-B1156AFD1A42}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {60D5F6A6-8D2E-4040-8728-B1156AFD1A42}.Debug.ActiveCfg = Debug|Win32 - {60D5F6A6-8D2E-4040-8728-B1156AFD1A42}.Debug.Build.0 = Debug|Win32 - {60D5F6A6-8D2E-4040-8728-B1156AFD1A42}.Release.ActiveCfg = Release|Win32 - {60D5F6A6-8D2E-4040-8728-B1156AFD1A42}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/gensapu.vcproj xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/gensapu.vcproj --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/gensapu.vcproj 2007-08-01 10:48:20.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/gensapu.vcproj 1970-01-01 00:00:00.000000000 +0000 @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/gym_play.cpp xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/gym_play.cpp --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/gym_play.cpp 2010-05-24 03:51:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/gym_play.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,256 +0,0 @@ -/* - * Copyright (C) 2008-2010 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -#include -#include -#include -#include "gym_play.h" -#include "psg.h" -#include "ym2612.h" - -//int Seg_L[1600], Seg_R[1600]; -int* Seg_L; int* Seg_R; -int Seg_Lenght; - -#define CLOCK_NTSC 53700000 //53693175 - -unsigned int Sound_Extrapol[312][2]; - -#ifdef __cplusplus -extern "C" { -#endif /* #ifdef __cplusplus */ - -int VDP_Current_Line = 0; -int GYM_Dumping = 0; - -int Update_GYM_Dump(char v0, char v1, char v2) -{ - return 0; -} - -#ifdef __cplusplus -} -#endif /* #ifdef __cplusplus */ - -unsigned char *jump_gym_time_pos(unsigned char *gym_start, unsigned int gym_size, unsigned int new_pos) -{ - unsigned int loop, num_zeros = 0; - - for (loop = 0; num_zeros < new_pos; loop++) - { - if (loop > gym_size) - { - return 0; - } - - switch(gym_start[loop]) - { - case(0x00): - num_zeros++; - continue; - case(0x01): - loop += 2; - continue; - case(0x02): - loop += 2; - continue; - case(0x03): - loop += 1; - continue; - } - } - - return (gym_start + loop); -} - -void Write_Sound_Stereo(short *Dest, int lenght) -{ - int i, out_L, out_R; - short *dest = Dest; - - for(i = 0; i < Seg_Lenght; i++) - { - out_L = Seg_L[i]; - Seg_L[i] = 0; - - if (out_L < -0x7FFF) *dest++ = -0x7FFF; - else if (out_L > 0x7FFF) *dest++ = 0x7FFF; - else *dest++ = (short) out_L; - - out_R = Seg_R[i]; - Seg_R[i] = 0; - - if (out_R < -0x7FFF) *dest++ = -0x7FFF; - else if (out_R > 0x7FFF) *dest++ = 0x7FFF; - else *dest++ = (short) out_R; - } -} - -void Start_Play_GYM(int sampleRate) -{ - Seg_Lenght = (int) ceil(sampleRate / 60.0); - -/* memset(Seg_L, 0, Seg_Lenght << 2); - memset(Seg_R, 0, Seg_Lenght << 2);*/ - - YM2612_Init(CLOCK_NTSC / 7, sampleRate, YM2612_Improv); - PSG_Init(CLOCK_NTSC / 15, sampleRate); -} - -unsigned char *GYM_Next(unsigned char *gym_start, unsigned char *gym_pos, unsigned int gym_size, unsigned int gym_loop) -{ - unsigned char c, c2; - - unsigned char dac_data[1600]; - - int *buf[2]; - int dacMax = 0, i = 0; - - int oldPos = 0; - double curPos = 0; - double dacSize; - int step; - int *dacBuf[2]; - int retCode = 1; - - YM_Buf[0] = PSG_Buf[0] = buf[0] = Seg_L; - YM_Buf[1] = PSG_Buf[1] = buf[1] = Seg_R; - - YM_Len = PSG_Len = 0; - - memset(dac_data, 0, sizeof(dac_data)); - - if (!gym_pos) - { - return 0; - } - - if ((unsigned int)(gym_pos - gym_start) >= gym_size) - { - if (gym_loop) - { - gym_pos = jump_gym_time_pos(gym_start, gym_size, gym_loop - 1); - } - else - { - return 0; - } - } - - do - { - c = *gym_pos++; - - switch(c) - { - case 0: - if (YM2612_Enable) - { - // if dacMax is zero, dacSize will be NaN - so what, we won't - // be using it in that case anyway :p - dacSize = (double)Seg_Lenght / dacMax; - - for (i = 0; i < dacMax; i++) - { - oldPos = (int)curPos; - - YM2612_Write(0, 0x2A); - YM2612_Write(1, dac_data[i]); - - if (i == dacMax - 1) - { - step = Seg_Lenght - oldPos; - } - else - { - curPos += dacSize; - step = (int)curPos - oldPos; - } - - dacBuf[0] = buf[0] + (int)oldPos; - dacBuf[1] = buf[1] + (int)oldPos; - - YM2612_DacAndTimers_Update(dacBuf, step); - } - - YM2612_Update(buf, Seg_Lenght); - } - if (PSG_Enable) - { - if (PSG_Improv) - { - PSG_Update_SIN(buf, Seg_Lenght); - } - else - { - PSG_Update(buf, Seg_Lenght); - } - } - break; - - case 1: - c2 = *gym_pos++; - - if (c2 == 0x2A) - { - c2 = *gym_pos++; - dac_data[dacMax++] = c2; - } - else - { - YM2612_Write(0, c2); - c2 = *gym_pos++; - YM2612_Write(1, c2); - } - break; - - case 2: - c2 = *gym_pos++; - YM2612_Write(2, c2); - - c2 = *gym_pos++; - YM2612_Write(3, c2); - break; - - case 3: - c2 = *gym_pos++; - PSG_Write(c2); - break; - } - - } while (c); - - return gym_pos; -} - -unsigned char *Play_GYM(void *Dump_Buf, unsigned char *gym_start, unsigned char *gym_pos, unsigned int gym_size, unsigned int gym_loop) -{ - unsigned char *new_gym_pos = GYM_Next(gym_start, gym_pos, gym_size, gym_loop); - - if (new_gym_pos == 0) - { - return 0; - } - - Write_Sound_Stereo((short *)Dump_Buf, Seg_Lenght); - - return new_gym_pos; -} diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/gym_play.h xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/gym_play.h --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/gym_play.h 2010-05-24 03:51:41.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/gym_play.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -#ifndef SOUND_H -#define SOUND_H -/* - * Copyright (C) 2008-2010 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -///////////////////////////////////////////////////////////////////////////////////////////// -// SOUND.H -///////////////////////////////////////////////////////////////////////////////////////////// - -#ifdef __cplusplus -extern "C" { -#endif /* #ifdef __cplusplus */ - -extern int* Seg_L, *Seg_R; -extern int Seg_Lenght; - -extern unsigned int Sound_Extrapol[312][2]; - -void Start_Play_GYM(int sampleRate); -unsigned char *Play_GYM(void *Dump_Buf, unsigned char *gym_start, unsigned char *gym_pos, unsigned int gym_size, unsigned int gym_loop); - -unsigned char *jump_gym_time_pos(unsigned char *gym_start, unsigned int gym_size, unsigned int new_pos); - -#ifdef __cplusplus -} -#endif /* #ifdef __cplusplus */ - -#endif - diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/Makefile.in xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/Makefile.in --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/Makefile.in 2010-06-10 22:43:09.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -ARCH=@ARCH@ - -CFLAGS+=-D_LINUX -fPIC -I../../../linux -I../../../ -I../../../../guilib/ -CXXFLAGS+=-D_LINUX -fPIC -I../../../linux -I../../../ -I../../../../guilib/ -OBJS=gym_play.o psg.o XBMCGYM.o ym2612.o -ifeq ($(ARCH), powerpc-osx) - BUNDLE1_O=-lbundle1.o -L/usr/lib/gcc/powerpc-apple-darwin8/4.0.1/ -lgcc -endif - -SLIB=../../../../system/players/paplayer/gensapu-@ARCH@.so - -$(SLIB): $(OBJS) -ifeq ($(findstring osx,$(ARCH)), osx) - ld -bundle -flat_namespace -undefined suppress -o $@ *.o $(BUNDLE1_O) - ../../../../tools/Mach5/wrapper.rb $@;mv output.so $@ - chmod +x $@ -else - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ *.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o - -endif - -include ../../../../Makefile.include - diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/psg.c xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/psg.c --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/psg.c 2010-05-24 03:51:13.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/psg.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,491 +0,0 @@ -/*************************************************************************** - * Gens: TI SN76489 (PSG) emulator. * - * * - * Copyright (c) 1999-2002 by Stéphane Dallongeville * - * Copyright (c) 2003-2004 by Stéphane Akhoun * - * Copyright (c) 2008-2009 by David Korth * - * * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License along * - * with this program; if not, write to the Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -/***********************************************************/ -/* */ -/* PSG.C : SN76489 emulator */ -/* */ -/* Noise define constantes taken from MAME */ -/* */ -/* This source is a part of Gens project */ -/* Written by Stéphane Dallongeville (gens@consolemul.com) */ -/* Copyright (c) 2002 by Stéphane Dallongeville */ -/* */ -/***********************************************************/ - -#include -#include -#include "psg.h" - - -/* Defines */ - -#ifndef PI -#define PI 3.14159265358979323846 -#endif - -// Change MAX_OUTPUT to change PSG volume (default = 0x7FFF) - -#define MAX_OUTPUT 0x4FFF - -#define W_NOISE 0x12000 -#define P_NOISE 0x08000 - -//#define NOISE_DEF 0x0f35 -//#define NOISE_DEF 0x0001 -#define NOISE_DEF 0x4000 - -#define PSG_DEBUG_LEVEL 0 - -#if PSG_DEBUG_LEVEL > 0 - -#define PSG_DEBUG_0(x) \ -fprintf(psg_debug_file, (x)); -#define PSG_DEBUG_1(x, a) \ -fprintf(psg_debug_file, (x), (a)); -#define PSG_DEBUG_2(x, a, b) \ -fprintf(psg_debug_file, (x), (a), (b)); -#define PSG_DEBUG_3(x, a, b, c) \ -fprintf(psg_debug_file, (x), (a), (b), (c)); -#define PSG_DEBUG_4(x, a, b, c, d) \ -fprintf(psg_debug_file, (x), (a), (b), (c), (d)); - -#else - -#define PSG_DEBUG_0(x) -#define PSG_DEBUG_1(x, a) -#define PSG_DEBUG_2(x, a, b) -#define PSG_DEBUG_3(x, a, b, c) -#define PSG_DEBUG_4(x, a, b, c, d) - -#endif - - -/* Variables */ - -unsigned int PSG_SIN_Table[16][512]; -unsigned int PSG_Step_Table[1024]; -unsigned int PSG_Volume_Table[16]; -unsigned int PSG_Noise_Step_Table[4]; -unsigned int PSG_Save[8]; - -struct _psg PSG; - -#if PSG_DEBUG_LEVEL > 0 -FILE *psg_debug_file = NULL; -#endif - - -/* Gens specific extern and variables */ - -extern unsigned int Sound_Extrapol[312][2]; -extern int Seg_L[882], Seg_R[882]; -extern int VDP_Current_Line; -extern int GYM_Dumping; - -int Update_GYM_Dump(char v0, char v1, char v2); - -int PSG_Enable; -int PSG_Improv; -int *PSG_Buf[2]; -int PSG_Len = 0; - -int PSG_Chan_Enable[4]; - -/* Functions */ - -void PSG_Write(int data) -{ - if (GYM_Dumping) Update_GYM_Dump((unsigned char) 3, (unsigned char) data, (unsigned char) 0); - - if (data & 0x80) - { - PSG.Current_Register = (data & 0x70) >> 4; - PSG.Current_Channel = PSG.Current_Register >> 1; - - data &= 0x0F; - - PSG.Register[PSG.Current_Register] = (PSG.Register[PSG.Current_Register] & 0x3F0) | data; - - if (PSG.Current_Register & 1) - { - // Volume - - PSG_Special_Update(); - - PSG.Volume[PSG.Current_Channel] = PSG_Volume_Table[data]; - - PSG_DEBUG_2("channel %d volume = %.8X\n", PSG.Current_Channel, PSG.Volume[PSG.Current_Channel]); - } - else - { - // Frequency - - PSG_Special_Update(); - - if (PSG.Current_Channel != 3) - { - // Normal channel - - PSG.CntStep[PSG.Current_Channel] = PSG_Step_Table[PSG.Register[PSG.Current_Register]]; - - if ((PSG.Current_Channel == 2) && ((PSG.Register[6] & 3) == 3)) - { - PSG.CntStep[3] = PSG.CntStep[2] >> 1; - } - - PSG_DEBUG_2("channel %d step = %.8X\n", PSG.Current_Channel, PSG.CntStep[PSG.Current_Channel]); - } - else - { - // Noise channel - - PSG.Noise = NOISE_DEF; - PSG_Noise_Step_Table[3] = PSG.CntStep[2] >> 1; - PSG.CntStep[3] = PSG_Noise_Step_Table[data & 3]; - - if (data & 4) PSG.Noise_Type = W_NOISE; - else PSG.Noise_Type = P_NOISE; - - PSG_DEBUG_1("channel N type = %.2X\n", data); - } - } - } - else - { - if (!(PSG.Current_Register & 1)) - { - // Frequency - - if (PSG.Current_Channel != 3) - { - PSG_Special_Update(); - - PSG.Register[PSG.Current_Register] = (PSG.Register[PSG.Current_Register] & 0x0F) | ((data & 0x3F) << 4); - - PSG.CntStep[PSG.Current_Channel] = PSG_Step_Table[PSG.Register[PSG.Current_Register]]; - - if ((PSG.Current_Channel == 2) && ((PSG.Register[6] & 3) == 3)) - { - PSG.CntStep[3] = PSG.CntStep[2] >> 1; - } - - PSG_DEBUG_2("channel %d step = %.8X\n", PSG.Current_Channel, PSG.CntStep[PSG.Current_Channel]); - } - } - } -} - - -void PSG_Update_SIN(int **buffer, int length) -{ - int i, j, out; - int cur_cnt, cur_step, cur_vol; - unsigned int *sin_t; - - for(j = 2; j >= 0; j--) - { - if (PSG.Volume[j]) - { - cur_cnt = PSG.Counter[j]; - cur_step = PSG.CntStep[j]; - sin_t = PSG_SIN_Table[PSG.Register[(j << 1) + 1]]; - - for(i = 0; i < length; i++) - { - out = sin_t[(cur_cnt = (cur_cnt + cur_step) & 0x1FFFF) >> 8]; - - if (PSG_Chan_Enable[j]) - { - buffer[0][i] += out; - buffer[1][i] += out; - } - } - - PSG.Counter[j] = cur_cnt; - } - else PSG.Counter[j] += PSG.CntStep[j] * length; - } - - - // Channel 3 - Noise - - if ((cur_vol = PSG.Volume[3])) - { - cur_cnt = PSG.Counter[3]; - cur_step = PSG.CntStep[3]; - - for(i = 0; i < length; i++) - { - cur_cnt += cur_step; - - if (PSG.Noise & 1) - { - if (PSG_Chan_Enable[3]) - { - buffer[0][i] += cur_vol; - buffer[1][i] += cur_vol; - } - - if (cur_cnt & 0x10000) - { - cur_cnt &= 0xFFFF; - PSG.Noise = (PSG.Noise ^ PSG.Noise_Type) >> 1; - } - } - else if (cur_cnt & 0x10000) - { - cur_cnt &= 0xFFFF; - PSG.Noise >>= 1; - } - } - - PSG.Counter[3] = cur_cnt; - } - else PSG.Counter[3] += PSG.CntStep[3] * length; -} - - -void PSG_Update(int **buffer, int length) -{ - int i, j; - int cur_cnt, cur_step, cur_vol; - - for(j = 2; j >= 0; j--) - { - if ((cur_vol = PSG.Volume[j])) - { - if ((cur_step = PSG.CntStep[j]) < 0x10000) - { - cur_cnt = PSG.Counter[j]; - - for(i = 0; i < length; i++) - { - if ((cur_cnt += cur_step) & 0x10000) - { - if (PSG_Chan_Enable[j]) - { - buffer[0][i] += cur_vol; - buffer[1][i] += cur_vol; - } - } - } - - PSG.Counter[j] = cur_cnt; - } - else - { - for(i = 0; i < length; i++) - { - if (PSG_Chan_Enable[j]) - { - buffer[0][i] += cur_vol; - buffer[1][i] += cur_vol; - } - } - } - } - else - { - PSG.Counter[j] += PSG.CntStep[j] * length; - } - } - - // Channel 3 - Noise - - if ((cur_vol = PSG.Volume[3])) - { - cur_cnt = PSG.Counter[3]; - cur_step = PSG.CntStep[3]; - - for(i = 0; i < length; i++) - { - cur_cnt += cur_step; - - if (PSG.Noise & 1) - { - if (PSG_Chan_Enable[3]) - { - buffer[0][i] += cur_vol; - buffer[1][i] += cur_vol; - } - - if (cur_cnt & 0x10000) - { - cur_cnt &= 0xFFFF; - PSG.Noise = (PSG.Noise ^ PSG.Noise_Type) >> 1; - } - } - else if (cur_cnt & 0x10000) - { - cur_cnt &= 0xFFFF; - PSG.Noise >>= 1; - } - } - - PSG.Counter[3] = cur_cnt; - } - else PSG.Counter[3] += PSG.CntStep[3] * length; -} - - -void PSG_Init(int clock, int rate) -{ - int i, j; - double out; - -#if PSG_DEBUG_LEVEL > 0 - if (psg_debug_file == NULL) - { - psg_debug_file = fopen("psg.log", "w"); - fprintf(psg_debug_file, "PSG logging :\n\n"); - } -#endif - - for(i = 1; i < 1024; i++) - { - // Step calculation - - out = (double) (clock) / (double) (i << 4); // out = frequency - out /= (double) (rate); - out *= 65536.0; - - PSG_Step_Table[i] = (unsigned int) out; - } - - PSG_Step_Table[0] = PSG_Step_Table[1]; - - for(i = 0; i < 3; i++) - { - out = (double) (clock) / (double) (1 << (9 + i)); - out /= (double) (rate); - out *= 65536.0; - - PSG_Noise_Step_Table[i] = (unsigned int) out; - } - - PSG_Noise_Step_Table[3] = 0; - - out = (double) MAX_OUTPUT / 3.0; - - for (i = 0; i < 15; i++) - { - PSG_Volume_Table[i] = (unsigned int) out; - out /= 1.258925412; // = 10 ^ (2/20) = 2dB - } - - PSG_Volume_Table[15] = 0; - -/* - for(i = 0; i < 256; i++) - { - out = (i + 1.0) / 256.0; - - for(j = 0; j < 16; j++) - { - PSG_SIN_Table[j][i] = (unsigned int) (out * (double) PSG_Volume_Table[j]); - } - } - - for(i = 0; i < 256; i++) - { - out = 1.0 - ((i + 1.0) / 256.0); - - for(j = 0; j < 16; j++) - { - PSG_SIN_Table[j][i + 256] = (unsigned int) (out * (double) PSG_Volume_Table[j]); - } - } -*/ - for(i = 0; i < 512; i++) - { - out = sin((2.0 * PI) * ((double) (i) / 512)); - out = sin((2.0 * PI) * ((double) (i) / 512)); - - for(j = 0; j < 16; j++) - { - PSG_SIN_Table[j][i] = (unsigned int) (out * (double) PSG_Volume_Table[j]); - } - } - - PSG.Current_Register = 0; - PSG.Current_Channel = 0; - PSG.Noise = 0; - PSG.Noise_Type = 0; - - for (i = 0; i < 4; i++) - { - PSG.Volume[i] = 0; - PSG.Counter[i] = 0; - PSG.CntStep[i] = 0; - } - - for (i = 0; i < 8; i += 2) - { - PSG_Save[i] = 0; - PSG_Save[i + 1] = 0x0F; // volume = OFF - } - - PSG_Restore_State(); // Reset -} - - -void PSG_Save_State(void) -{ - int i; - - for(i = 0; i < 8; i++) PSG_Save[i] = PSG.Register[i]; -} - - -void PSG_Restore_State(void) -{ - int i; - - for(i = 0; i < 8; i++) - { - PSG_Write(0x80 | (i << 4) | (PSG_Save[i] & 0xF)); - PSG_Write((PSG_Save[i] >> 4) & 0x3F); - } -} - - -/* Gens */ - -void PSG_Special_Update(void) -{ - if (PSG_Len && PSG_Enable) - { - if (PSG_Improv) PSG_Update_SIN(PSG_Buf, PSG_Len); - else PSG_Update(PSG_Buf, PSG_Len); - - PSG_Buf[0] = Seg_L + Sound_Extrapol[VDP_Current_Line + 1][0]; - PSG_Buf[1] = Seg_R + Sound_Extrapol[VDP_Current_Line + 1][0]; - PSG_Len = 0; - } -} - -#ifdef __PORT__ -void _PSG_Write(int data) __attribute__ ((alias ("PSG_Write"))); -#endif - -/* end */ diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/psg.h xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/psg.h --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/psg.h 2010-05-24 03:51:13.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/psg.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -/*************************************************************************** - * Gens: TI SN76489 (PSG) emulator. * - * * - * Copyright (c) 1999-2002 by Stéphane Dallongeville * - * Copyright (c) 2003-2004 by Stéphane Akhoun * - * Copyright (c) 2008-2009 by David Korth * - * * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License along * - * with this program; if not, write to the Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#ifndef _PSG_H -#define _PSG_H - -#ifdef __cplusplus -extern "C" { -#endif - - -extern unsigned int PSG_Save[8]; - -struct _psg -{ - int Current_Channel; - int Current_Register; - int Register[8]; - unsigned int Counter[4]; - unsigned int CntStep[4]; - int Volume[4]; - unsigned int Noise_Type; - unsigned int Noise; -}; - -extern struct _psg PSG; - -/* Gens */ - -extern int PSG_Enable; -extern int PSG_Improv; -extern int *PSG_Buf[2]; -extern int PSG_Len; - -extern int PSG_Chan_Enable[4]; - -/* end */ - -void PSG_Write(int data); -void PSG_Update_SIN(int **buffer, int length); -void PSG_Update(int **buffer, int length); -void PSG_Init(int clock, int rate); -void PSG_Save_State(void); -void PSG_Restore_State(void); - -/* Gens */ - -void PSG_Special_Update(void); - -#ifdef __cplusplus -}; -#endif - -#endif diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/readme.txt xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/readme.txt --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/readme.txt 2008-07-15 18:34:24.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/readme.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -Compiled using foobar2000 0.7 final SDK. - -Changes 1.4 -> 1.5 ------------------- -* Added options for looping tracks (number of loops and fade length) - -Changes 1.3 -> 1.4 ------------------- -* Finally fixed long-standing issues with memory leaks - -Changes 1.2b -> 1.3 -------------------- -* Compiled with 0.7 final SDK -* Added options to allow for turning individual YM2612 and PSG channels on and off - -Changes 1.2a -> 1.2b --------------------- - -* Necessary changes for 0.7b29 SDK made - -Changes 1.2 -> 1.2a -------------------- - -* Only populates info fields if they aren't empty - -Changes 1.1 -> 1.2 ------------------- - -* Fixed (I think) potential crash bug in loading EZPK-compressed GYM files -* Necessary changes made for foobar 0.7(b13) -* Some minor code cleanup, mostly dealing with configuration -* Compressed with UPX - -Changes 1.0b -> 1.1 -------------------- - -* Now supports EZPK-compressed (basically customized libbzip2) GYM files -* No longer relies on zlib.dll (necessary parts statically linked in now instead) -* Some minor optimization - ---- - -Credits: - - -Uses source code from libbzip2, zlib, Gens, and kpigym. Uses information from YMAMP 2.0. - - libbzip2 1.0.2 copyright (C) 1996-2002 Julian R Seward. All rights reserved. - zlib 1.1.4 (C) 1995-1998 Jean-loup Gailly and Mark Adler - Gens 2.12a Copyright (c) 2002 by St�phane Dallongeville - kpigym 1.0r6+ (C) 2002 by Mamiya - YMAMP 2.0 (C) 1999-2000 by Marp - -<----- END OF ORIGINAL DOCUMENTATION ------> - -I used the sources for foo_gym as basis for adding the plugin to xbmc. thanks a lot! -currently stripped for zlib and libbzip2 - -spiff \ No newline at end of file diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/XBMCGYM.cpp xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/XBMCGYM.cpp --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/XBMCGYM.cpp 2010-05-24 03:51:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/XBMCGYM.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,251 +0,0 @@ -/* - * Copyright (C) 2008-2010 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -#include -#include -#include -#include - -#ifndef _LINUX -#include -#else -#include "PlatformInclude.h" -#undef __declspec -#define __declspec(x) -#endif - -#include "gym_play.h" -#include "ym2612.h" -#include "psg.h" - -HANDLE hMutex = NULL; - -extern "C" -{ - extern struct ym2612__ YM2612; - extern struct _psg PSG; - - struct GYMSong - { - unsigned char* gym; // this is the one alloced - unsigned char* gymStart; - unsigned char* gymPos; - unsigned int gymSize; - struct GYMTAG - { - char gym_id[4]; - char song_title[32]; - char game_title[32]; - char game_publisher[32]; - char dumper_emu[32]; - char dumper_person[32]; - char comments[256]; - unsigned int looped; - unsigned int compressed; - }; - GYMTAG* gymTag; - __int64 iLength; - int Seg_L[1600], Seg_R[1600]; - struct ym2612__ YM2612; - struct _psg PSG; - }; - - __int64 calc_gym_time_length(GYMSong* gym) - { - if (gym->gymStart == 0 || gym->gymSize == 0) - return 0; - - unsigned int loop, num_zeros = 0; - - for(loop = 0; loop < gym->gymSize; loop++) - { - switch(gym->gymStart[loop]) - { - case(0x00): - num_zeros++; - continue; - case(0x01): - loop += 2; - continue; - case(0x02): - loop += 2; - continue; - case(0x03): - loop += 1; - continue; - } - } - - return (__int64)(num_zeros)*1000/60; - } - - int __declspec(dllexport) DLL_Init() - { - if (!hMutex) - { - hMutex = CreateMutex(NULL,true,NULL); - YM2612_Enable = true; - YM2612_Improv = true; - - Chan_Enable[0] = true; - Chan_Enable[1] = true; - Chan_Enable[2] = true; - Chan_Enable[3] = true; - Chan_Enable[4] = true; - Chan_Enable[5] = true; - DAC_Enable = true; - - PSG_Enable = true; - PSG_Improv = true; - - PSG_Chan_Enable[0] = true; - PSG_Chan_Enable[1] = true; - PSG_Chan_Enable[2] = true; - PSG_Chan_Enable[3] = true; - - ReleaseMutex(hMutex); - } - return (int) ceil(48000/60.0) << 2; - } - - void __declspec(dllexport) DLL_DeInit() - { - } - - long __declspec(dllexport) DLL_LoadGYM(const char *szFileName) - { - GYMSong* result = new GYMSong; - FILE* f = fopen(szFileName,"rb"); - int iResult = 0; - if (f) - { - WaitForSingleObject(hMutex,INFINITE); - fseek(f,0,SEEK_END); - result->gymSize = ftell(f); - fseek(f,0,SEEK_SET); - result->gym = (unsigned char*)malloc(result->gymSize*sizeof(unsigned char)); - unsigned int iRead = 0; - result->gymPos = result->gym; - while (iRead < result->gymSize) - { - if (fread(result->gym,1,result->gymSize,f) != 1) - break; - - int iCurrRead = fread(result->gymPos,1,16384,f); - if (iCurrRead > 0) - { - iRead += iCurrRead; - ReleaseMutex(hMutex); - Sleep(10); // prevent starving pap during xfade - WaitForSingleObject(hMutex,INFINITE); - } - else - break; - } - - fclose(f); - result->gymTag = (GYMSong::GYMTAG*)result->gym; - if (strncmp(((GYMSong::GYMTAG*)result->gym)->gym_id, "GYMX", 4) == 0) - { - result->gymStart = result->gymPos = result->gym+sizeof(GYMSong::GYMTAG); - result->gymSize -= sizeof(GYMSong::GYMTAG); - result->iLength = calc_gym_time_length(result); - } - else - { - result->gymStart = result->gymPos = result->gym; - result->gymTag = NULL; - } - - - result->YM2612 = YM2612; - result->PSG = PSG; - Start_Play_GYM(48000); - iResult = (long)result; - ReleaseMutex(hMutex); - } - - return (int)iResult; - } - - void __declspec(dllexport) DLL_FreeGYM(int gym) - { - GYMSong* song = (GYMSong*)gym; - free(song->gym); - free(song); - } - - int __declspec(dllexport) DLL_FillBuffer(int gym, char* szBuffer) - { - WaitForSingleObject(hMutex,INFINITE); - GYMSong* song = (GYMSong*)gym; - Seg_L = song->Seg_L; - Seg_R = song->Seg_R; - YM2612 = song->YM2612; - PSG = song->PSG; - song->gymPos = Play_GYM(szBuffer,song->gymStart,song->gymPos,song->gymSize,0); - song->YM2612 = YM2612; - song->PSG = PSG; - ReleaseMutex(hMutex); - if (!song->gymPos) - return 0; - - return 1; - } - - void __declspec(dllexport) DLL_Seek(int gym, unsigned int iPos) - { - WaitForSingleObject(hMutex,INFINITE); - GYMSong* song = (GYMSong*)gym; - Seg_L = song->Seg_L; - Seg_R = song->Seg_R; - YM2612 = song->YM2612; - PSG = song->PSG; - jump_gym_time_pos(song->gymStart,song->gymSize,iPos); - song->YM2612 = YM2612; - song->PSG = PSG; - ReleaseMutex(hMutex); - } - - long __declspec(dllexport) DLL_GetArtist(int gym) - { - GYMSong* song = (GYMSong*)gym; - if (song->gymTag) - return (long)song->gymTag->game_publisher; - - return 0; - } - - long __declspec(dllexport) DLL_GetTitle(int gym) - { - GYMSong* song = (GYMSong*)gym; - if (song->gymTag) - return (long)song->gymTag->song_title; - - return 0; - } - - __int64 __declspec(dllexport) DLL_GetLength(int gym) - { - GYMSong* song = (GYMSong*)gym; - return song->iLength; - } -} diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/ym2612.c xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/ym2612.c --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/ym2612.c 2010-05-24 03:51:13.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/ym2612.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,2503 +0,0 @@ -/*************************************************************************** - * Gens: Yamaha YM2612 FM synthesis chip emulator. * - * * - * Copyright (c) 1999-2002 by Stéphane Dallongeville * - * Copyright (c) 2003-2004 by Stéphane Akhoun * - * Copyright (c) 2008-2009 by David Korth * - * * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License along * - * with this program; if not, write to the Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -/*********************************************************** - * * - * YM2612.C : YM2612 emulator * - * * - * Almost constantes are taken from the MAME core * - * * - * This source is a part of Gens project * - * Written by Stéphane Dallongeville (gens@consolemul.com) * - * Copyright (c) 2002 by Stéphane Dallongeville * - * * - ***********************************************************/ - -#include -#include -#include -#include "ym2612.h" - - -/******************************************** - * Partie définition * - ********************************************/ - -#define YM_DEBUG_LEVEL 0 - -#ifndef PI -#define PI 3.14159265358979323846 -#endif - -#define ATTACK 0 -#define DECAY 1 -#define SUBSTAIN 2 -#define RELEASE 3 - -// SIN_LBITS <= 16 -// LFO_HBITS <= 16 -// (SIN_LBITS + SIN_HBITS) <= 26 -// (ENV_LBITS + ENV_HBITS) <= 28 -// (LFO_LBITS + LFO_HBITS) <= 28 - -#define SIN_HBITS 12 // Sinus phase counter int part -#define SIN_LBITS (26 - SIN_HBITS) // Sinus phase counter float part (best setting) - -#if (SIN_LBITS > 16) -#define SIN_LBITS 16 // Can't be greater than 16 bits -#endif - -#define ENV_HBITS 12 // Env phase counter int part -#define ENV_LBITS (28 - ENV_HBITS) // Env phase counter float part (best setting) - -#define LFO_HBITS 10 // LFO phase counter int part -#define LFO_LBITS (28 - LFO_HBITS) // LFO phase counter float part (best setting) - -#define SIN_LENGHT (1 << SIN_HBITS) -#define ENV_LENGHT (1 << ENV_HBITS) -#define LFO_LENGHT (1 << LFO_HBITS) - -#define TL_LENGHT (ENV_LENGHT * 3) // Env + TL scaling + LFO - -#define SIN_MASK (SIN_LENGHT - 1) -#define ENV_MASK (ENV_LENGHT - 1) -#define LFO_MASK (LFO_LENGHT - 1) - -#define ENV_STEP (96.0 / ENV_LENGHT) // ENV_MAX = 96 dB - -#define ENV_ATTACK ((ENV_LENGHT * 0) << ENV_LBITS) -#define ENV_DECAY ((ENV_LENGHT * 1) << ENV_LBITS) -#define ENV_END ((ENV_LENGHT * 2) << ENV_LBITS) - -#define MAX_OUT_BITS (SIN_HBITS + SIN_LBITS + 2) // Modulation = -4 <--> +4 -#define MAX_OUT ((1 << MAX_OUT_BITS) - 1) - -//Just for tests stuff... -// -//#define COEF_MOD 0.5 -//#define MAX_OUT ((int) (((1 << MAX_OUT_BITS) - 1) * COEF_MOD)) - -#define OUT_BITS (OUTPUT_BITS - 2) -#define OUT_SHIFT (MAX_OUT_BITS - OUT_BITS) -#define LIMIT_CH_OUT ((int) (((1 << OUT_BITS) * 1.5) - 1)) - -#define PG_CUT_OFF ((int) (78.0 / ENV_STEP)) -#define ENV_CUT_OFF ((int) (68.0 / ENV_STEP)) - -#define AR_RATE 399128 -#define DR_RATE 5514396 - -//#define AR_RATE 426136 -//#define DR_RATE (AR_RATE * 12) - -#define LFO_FMS_LBITS 9 // FIXED (LFO_FMS_BASE gives somethink as 1) -#define LFO_FMS_BASE ((int) (0.05946309436 * 0.0338 * (double) (1 << LFO_FMS_LBITS))) - -#define S0 0 // Stupid typo of the YM2612 -#define S1 2 -#define S2 1 -#define S3 3 - - -/******************************************** - * Partie variables * - ********************************************/ - - -struct ym2612__ YM2612; - -int *SIN_TAB[SIN_LENGHT]; // SINUS TABLE (pointer on TL TABLE) -int TL_TAB[TL_LENGHT * 2]; // TOTAL LEVEL TABLE (positif and minus) -unsigned int ENV_TAB[2 * ENV_LENGHT + 8]; // ENV CURVE TABLE (attack & decay) - -//unsigned int ATTACK_TO_DECAY[ENV_LENGHT]; // Conversion from attack to decay phase -unsigned int DECAY_TO_ATTACK[ENV_LENGHT]; // Conversion from decay to attack phase - -unsigned int FINC_TAB[2048]; // Frequency step table - -unsigned int AR_TAB[128]; // Attack rate table -unsigned int DR_TAB[96]; // Decay rate table -unsigned int DT_TAB[8][32]; // Detune table -unsigned int SL_TAB[16]; // Substain level table -unsigned int NULL_RATE[32]; // Table for NULL rate - -int LFO_ENV_TAB[LFO_LENGHT]; // LFO AMS TABLE (adjusted for 11.8 dB) -int LFO_FREQ_TAB[LFO_LENGHT]; // LFO FMS TABLE -int LFO_ENV_UP[MAX_UPDATE_LENGHT]; // Temporary calculated LFO AMS (adjusted for 11.8 dB) -int LFO_FREQ_UP[MAX_UPDATE_LENGHT]; // Temporary calculated LFO FMS - -int INTER_TAB[MAX_UPDATE_LENGHT]; // Interpolation table - -int LFO_INC_TAB[8]; // LFO step table - -int in0, in1, in2, in3; // current phase calculation -int en0, en1, en2, en3; // current enveloppe calculation - -const void (*UPDATE_CHAN[8 * 8])(channel_ *CH, int **buf, int lenght) = // Update Channel functions pointer table -{ - Update_Chan_Algo0, - Update_Chan_Algo1, - Update_Chan_Algo2, - Update_Chan_Algo3, - Update_Chan_Algo4, - Update_Chan_Algo5, - Update_Chan_Algo6, - Update_Chan_Algo7, - - Update_Chan_Algo0_LFO, - Update_Chan_Algo1_LFO, - Update_Chan_Algo2_LFO, - Update_Chan_Algo3_LFO, - Update_Chan_Algo4_LFO, - Update_Chan_Algo5_LFO, - Update_Chan_Algo6_LFO, - Update_Chan_Algo7_LFO, - - Update_Chan_Algo0_Int, - Update_Chan_Algo1_Int, - Update_Chan_Algo2_Int, - Update_Chan_Algo3_Int, - Update_Chan_Algo4_Int, - Update_Chan_Algo5_Int, - Update_Chan_Algo6_Int, - Update_Chan_Algo7_Int, - - Update_Chan_Algo0_LFO_Int, - Update_Chan_Algo1_LFO_Int, - Update_Chan_Algo2_LFO_Int, - Update_Chan_Algo3_LFO_Int, - Update_Chan_Algo4_LFO_Int, - Update_Chan_Algo5_LFO_Int, - Update_Chan_Algo6_LFO_Int, - Update_Chan_Algo7_LFO_Int -}; - -const void (*ENV_NEXT_EVENT[8])(slot_ *SL) = // Next Enveloppe phase functions pointer table -{ - Env_Attack_Next, - Env_Decay_Next, - Env_Substain_Next, - Env_Release_Next, - Env_NULL_Next, - Env_NULL_Next, - Env_NULL_Next, - Env_NULL_Next -}; - -const unsigned int DT_DEF_TAB[4 * 32] = -{ -// FD = 0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -// FD = 1 - 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, - 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 8, 8, 8, 8, - -// FD = 2 - 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, - 5, 6, 6, 7, 8, 8, 9, 10, 11, 12, 13, 14, 16, 16, 16, 16, - -// FD = 3 - 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, - 8 , 8, 9, 10, 11, 12, 13, 14, 16, 17, 19, 20, 22, 22, 22, 22 -}; - -const unsigned int FKEY_TAB[16] = -{ - 0, 0, 0, 0, - 0, 0, 0, 1, - 2, 3, 3, 3, - 3, 3, 3, 3 -}; - -const unsigned int LFO_AMS_TAB[4] = -{ - 31, 4, 1, 0 -}; - -const unsigned int LFO_FMS_TAB[8] = -{ - LFO_FMS_BASE * 0, LFO_FMS_BASE * 1, - LFO_FMS_BASE * 2, LFO_FMS_BASE * 3, - LFO_FMS_BASE * 4, LFO_FMS_BASE * 6, - LFO_FMS_BASE * 12, LFO_FMS_BASE * 24 -}; - -int int_cnt; // Interpolation calculation - - -#if YM_DEBUG_LEVEL > 0 // Debug -FILE *debug_file = NULL; -#endif - - -/* Gens */ - -extern unsigned int Sound_Extrapol[312][2]; -//extern int Seg_L[882], Seg_R[882]; -extern int *Seg_L, *Seg_R; -extern int VDP_Current_Line; -extern int GYM_Dumping; -extern int YM2612_Enable; -extern int DAC_Enable; - -int Update_GYM_Dump(char v0, char v1, char v2); - -int YM2612_Enable; -int YM2612_Improv; -int DAC_Enable; -int *YM_Buf[2]; -int YM_Len = 0; - -int Chan_Enable[6]; - -/* end */ - - -/*********************************************** - * fonctions calcul param * - ***********************************************/ - - -INLINE void CALC_FINC_SL(slot_ *SL, int finc, int kc) -{ - int ksr; - - SL->Finc = (finc + SL->DT[kc]) * SL->MUL; - - ksr = kc >> SL->KSR_S; // keycode atténuation - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "FINC = %d SL->Finc = %d\n", finc, SL->Finc); -#endif - - if (SL->KSR != ksr) // si le KSR a changé alors - { // les différents taux pour l'enveloppe sont mis à jour - SL->KSR = ksr; - - SL->EincA = SL->AR[ksr]; - SL->EincD = SL->DR[ksr]; - SL->EincS = SL->SR[ksr]; - SL->EincR = SL->RR[ksr]; - - if (SL->Ecurp == ATTACK) SL->Einc = SL->EincA; - else if (SL->Ecurp == DECAY) SL->Einc = SL->EincD; - else if (SL->Ecnt < ENV_END) - { - if (SL->Ecurp == SUBSTAIN) SL->Einc = SL->EincS; - else if (SL->Ecurp == RELEASE) SL->Einc = SL->EincR; - } - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "KSR = %.4X EincA = %.8X EincD = %.8X EincS = %.8X EincR = %.8X\n", ksr, SL->EincA, SL->EincD, SL->EincS, SL->EincR); -#endif - } -} - - -INLINE void CALC_FINC_CH(channel_ *CH) -{ - int finc, kc; - - finc = FINC_TAB[CH->FNUM[0]] >> (7 - CH->FOCT[0]); - kc = CH->KC[0]; - - CALC_FINC_SL(&CH->SLOT[0], finc, kc); - CALC_FINC_SL(&CH->SLOT[1], finc, kc); - CALC_FINC_SL(&CH->SLOT[2], finc, kc); - CALC_FINC_SL(&CH->SLOT[3], finc, kc); -} - - - -/*********************************************** - * fonctions setting * - ***********************************************/ - - -INLINE void KEY_ON(channel_ *CH, int nsl) -{ - slot_ *SL = &(CH->SLOT[nsl]); // on recupère le bon pointeur de slot - - if (SL->Ecurp == RELEASE) // la touche est-elle relâchée ? - { - SL->Fcnt = 0; - - // Fix Ecco 2 splash sound - - SL->Ecnt = (DECAY_TO_ATTACK[ENV_TAB[SL->Ecnt >> ENV_LBITS]] + ENV_ATTACK) & SL->ChgEnM; - SL->ChgEnM = 0xFFFFFFFF; - -// SL->Ecnt = DECAY_TO_ATTACK[ENV_TAB[SL->Ecnt >> ENV_LBITS]] + ENV_ATTACK; -// SL->Ecnt = 0; - - SL->Einc = SL->EincA; - SL->Ecmp = ENV_DECAY; - SL->Ecurp = ATTACK; - } -} - - -INLINE void KEY_OFF(channel_ *CH, int nsl) -{ - slot_ *SL = &(CH->SLOT[nsl]); // on recupère le bon pointeur de slot - - if (SL->Ecurp != RELEASE) // la touche est-elle appuyée ? - { - if (SL->Ecnt < ENV_DECAY) // attack phase ? - { - SL->Ecnt = (ENV_TAB[SL->Ecnt >> ENV_LBITS] << ENV_LBITS) + ENV_DECAY; - } - - SL->Einc = SL->EincR; - SL->Ecmp = ENV_END; - SL->Ecurp = RELEASE; - } -} - - -INLINE void CSM_Key_Control() -{ - KEY_ON(&YM2612.CHANNEL[2], 0); - KEY_ON(&YM2612.CHANNEL[2], 1); - KEY_ON(&YM2612.CHANNEL[2], 2); - KEY_ON(&YM2612.CHANNEL[2], 3); -} - - -int SLOT_SET(int Adr, unsigned char data) -{ - channel_ *CH; - slot_ *SL; - int nch, nsl; - - if ((nch = Adr & 3) == 3) return 1; - nsl = (Adr >> 2) & 3; - - if (Adr & 0x100) nch += 3; - - CH = &(YM2612.CHANNEL[nch]); - SL = &(CH->SLOT[nsl]); - - switch(Adr & 0xF0) - { - case 0x30: - if ((SL->MUL = (data & 0x0F))) SL->MUL <<= 1; - else SL->MUL = 1; - - SL->DT = DT_TAB[(data >> 4) & 7]; - - CH->SLOT[0].Finc = -1; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[%d], SLOT[%d] DTMUL = %.2X\n", nch, nsl, data & 0x7F); -#endif - break; - - case 0x40: - SL->TL = data & 0x7F; - - // SOR2 do a lot of TL adjustement and this fix R.Shinobi jump sound... - YM2612_Special_Update(); - -#if ((ENV_HBITS - 7) < 0) - SL->TLL = SL->TL >> (7 - ENV_HBITS); -#else - SL->TLL = SL->TL << (ENV_HBITS - 7); -#endif - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[%d], SLOT[%d] TL = %.2X\n", nch, nsl, SL->TL); -#endif - break; - - case 0x50: - SL->KSR_S = 3 - (data >> 6); - - CH->SLOT[0].Finc = -1; - - if (data &= 0x1F) SL->AR = &AR_TAB[data << 1]; - else SL->AR = &NULL_RATE[0]; - - SL->EincA = SL->AR[SL->KSR]; - if (SL->Ecurp == ATTACK) SL->Einc = SL->EincA; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[%d], SLOT[%d] AR = %.2X EincA = %.6X\n", nch, nsl, data, SL->EincA); -#endif - break; - - case 0x60: - if ((SL->AMSon = (data & 0x80))) SL->AMS = CH->AMS; - else SL->AMS = 31; - - if (data &= 0x1F) SL->DR = &DR_TAB[data << 1]; - else SL->DR = &NULL_RATE[0]; - - SL->EincD = SL->DR[SL->KSR]; - if (SL->Ecurp == DECAY) SL->Einc = SL->EincD; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[%d], SLOT[%d] AMS = %d DR = %.2X EincD = %.6X\n", nch, nsl, SL->AMSon, data, SL->EincD); -#endif - break; - - case 0x70: - if (data &= 0x1F) SL->SR = &DR_TAB[data << 1]; - else SL->SR = &NULL_RATE[0]; - - SL->EincS = SL->SR[SL->KSR]; - if ((SL->Ecurp == SUBSTAIN) && (SL->Ecnt < ENV_END)) SL->Einc = SL->EincS; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[%d], SLOT[%d] SR = %.2X EincS = %.6X\n", nch, nsl, data, SL->EincS); -#endif - break; - - case 0x80: - SL->SLL = SL_TAB[data >> 4]; - - SL->RR = &DR_TAB[((data & 0xF) << 2) + 2]; - - SL->EincR = SL->RR[SL->KSR]; - if ((SL->Ecurp == RELEASE) && (SL->Ecnt < ENV_END)) SL->Einc = SL->EincR; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[%d], SLOT[%d] SL = %.8X\n", nch, nsl, SL->SLL); - fprintf(debug_file, "CHANNEL[%d], SLOT[%d] RR = %.2X EincR = %.2X\n", nch, nsl, ((data & 0xF) << 1) | 2, SL->EincR); -#endif - break; - - case 0x90: - // SSG-EG envelope shapes : - /* - E At Al H - - 1 0 0 0 \\\\ - - 1 0 0 1 \___ - - 1 0 1 0 \/\/ - ___ - 1 0 1 1 \ - - 1 1 0 0 //// - ___ - 1 1 0 1 / - - 1 1 1 0 /\/\ - - 1 1 1 1 /___ - - E = SSG-EG enable - At = Start negate - Al = Altern - H = Hold */ - - if (data & 0x08) SL->SEG = data & 0x0F; - else SL->SEG = 0; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[%d], SLOT[%d] SSG-EG = %.2X\n", nch, nsl, data); -#endif - break; - } - - return 0; -} - - -int CHANNEL_SET(int Adr, unsigned char data) -{ - channel_ *CH; - int num; - - if ((num = Adr & 3) == 3) return 1; - - switch(Adr & 0xFC) - { - case 0xA0: - if (Adr & 0x100) num += 3; - CH = &(YM2612.CHANNEL[num]); - - YM2612_Special_Update(); - - CH->FNUM[0] = (CH->FNUM[0] & 0x700) + data; - CH->KC[0] = (CH->FOCT[0] << 2) | FKEY_TAB[CH->FNUM[0] >> 7]; - - CH->SLOT[0].Finc = -1; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[%d] part1 FNUM = %d KC = %d\n", num, CH->FNUM[0], CH->KC[0]); -#endif - break; - - case 0xA4: - if (Adr & 0x100) num += 3; - CH = &(YM2612.CHANNEL[num]); - - YM2612_Special_Update(); - - CH->FNUM[0] = (CH->FNUM[0] & 0x0FF) + ((int) (data & 0x07) << 8); - CH->FOCT[0] = (data & 0x38) >> 3; - CH->KC[0] = (CH->FOCT[0] << 2) | FKEY_TAB[CH->FNUM[0] >> 7]; - - CH->SLOT[0].Finc = -1; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[%d] part2 FNUM = %d FOCT = %d KC = %d\n", num, CH->FNUM[0], CH->FOCT[0], CH->KC[0]); -#endif - break; - - case 0xA8: - if (Adr < 0x100) - { - num++; - - YM2612_Special_Update(); - - YM2612.CHANNEL[2].FNUM[num] = (YM2612.CHANNEL[2].FNUM[num] & 0x700) + data; - YM2612.CHANNEL[2].KC[num] = (YM2612.CHANNEL[2].FOCT[num] << 2) | FKEY_TAB[YM2612.CHANNEL[2].FNUM[num] >> 7]; - - YM2612.CHANNEL[2].SLOT[0].Finc = -1; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[2] part1 FNUM[%d] = %d KC[%d] = %d\n", num, YM2612.CHANNEL[2].FNUM[num], num, YM2612.CHANNEL[2].KC[num]); -#endif - } - break; - - case 0xAC: - if (Adr < 0x100) - { - num++; - - YM2612_Special_Update(); - - YM2612.CHANNEL[2].FNUM[num] = (YM2612.CHANNEL[2].FNUM[num] & 0x0FF) + ((int) (data & 0x07) << 8); - YM2612.CHANNEL[2].FOCT[num] = (data & 0x38) >> 3; - YM2612.CHANNEL[2].KC[num] = (YM2612.CHANNEL[2].FOCT[num] << 2) | FKEY_TAB[YM2612.CHANNEL[2].FNUM[num] >> 7]; - - YM2612.CHANNEL[2].SLOT[0].Finc = -1; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[2] part2 FNUM[%d] = %d FOCT[%d] = %d KC[%d] = %d\n", num, YM2612.CHANNEL[2].FNUM[num], num, YM2612.CHANNEL[2].FOCT[num], num, YM2612.CHANNEL[2].KC[num]); -#endif - } - break; - - case 0xB0: - if (Adr & 0x100) num += 3; - CH = &(YM2612.CHANNEL[num]); - - if (CH->ALGO != (data & 7)) - { - // Fix VectorMan 2 heli sound (level 1) - YM2612_Special_Update(); - - CH->ALGO = data & 7; - - CH->SLOT[0].ChgEnM = 0; - CH->SLOT[1].ChgEnM = 0; - CH->SLOT[2].ChgEnM = 0; - CH->SLOT[3].ChgEnM = 0; - } - - CH->FB = 9 - ((data >> 3) & 7); // Real thing ? - -// if (CH->FB = ((data >> 3) & 7)) CH->FB = 9 - CH->FB; // Thunder force 4 (music stage 8), Gynoug, Aladdin bug sound... -// else CH->FB = 31; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "CHANNEL[%d] ALGO = %d FB = %d\n", num, CH->ALGO, CH->FB); -#endif - break; - - case 0xB4: - if (Adr & 0x100) num += 3; - CH = &(YM2612.CHANNEL[num]); - - YM2612_Special_Update(); - - if (data & 0x80) CH->LEFT = 0xFFFFFFFF; - else CH->LEFT = 0; - - if (data & 0x40) CH->RIGHT = 0xFFFFFFFF; - else CH->RIGHT = 0; - - CH->AMS = LFO_AMS_TAB[(data >> 4) & 3]; - CH->FMS = LFO_FMS_TAB[data & 7]; - - if (CH->SLOT[0].AMSon) CH->SLOT[0].AMS = CH->AMS; - else CH->SLOT[0].AMS = 31; - if (CH->SLOT[1].AMSon) CH->SLOT[1].AMS = CH->AMS; - else CH->SLOT[1].AMS = 31; - if (CH->SLOT[2].AMSon) CH->SLOT[2].AMS = CH->AMS; - else CH->SLOT[2].AMS = 31; - if (CH->SLOT[3].AMSon) CH->SLOT[3].AMS = CH->AMS; - else CH->SLOT[3].AMS = 31; - -#if YM_DEBUG_LEVEL > 0 - fprintf(debug_file, "CHANNEL[%d] AMS = %d FMS = %d\n", num, CH->AMS, CH->FMS); -#endif - break; - } - - return 0; -} - - -int YM_SET(int Adr, unsigned char data) -{ - channel_ *CH; - int nch; - - switch(Adr) - { - case 0x22: - if (data & 8) - { - // Cool Spot music 1, LFO modified severals time which - // distord the sound, have to check that on a real genesis... - - YM2612.LFOinc = LFO_INC_TAB[data & 7]; - -#if YM_DEBUG_LEVEL > 0 - fprintf(debug_file, "\nLFO Enable, LFOinc = %.8X %d\n", YM2612.LFOinc, data & 7); -#endif - } - else - { - YM2612.LFOinc = YM2612.LFOcnt = 0; - -#if YM_DEBUG_LEVEL > 0 - fprintf(debug_file, "\nLFO Disable\n"); -#endif - } - break; - - case 0x24: - YM2612.TimerA = (YM2612.TimerA & 0x003) | (((int) data) << 2); - - if (YM2612.TimerAL != (1024 - YM2612.TimerA) << 12) - { - YM2612.TimerAcnt = YM2612.TimerAL = (1024 - YM2612.TimerA) << 12; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "Timer A Set = %.8X\n", YM2612.TimerAcnt); -#endif - } - break; - - case 0x25: - YM2612.TimerA = (YM2612.TimerA & 0x3fc) | (data & 3); - - if (YM2612.TimerAL != (1024 - YM2612.TimerA) << 12) - { - YM2612.TimerAcnt = YM2612.TimerAL = (1024 - YM2612.TimerA) << 12; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "Timer A Set = %.8X\n", YM2612.TimerAcnt); -#endif - } - break; - - case 0x26: - YM2612.TimerB = data; - - if (YM2612.TimerBL != (256 - YM2612.TimerB) << (4 + 12)) - { - YM2612.TimerBcnt = YM2612.TimerBL = (256 - YM2612.TimerB) << (4 + 12); - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "Timer B Set = %.8X\n", YM2612.TimerBcnt); -#endif - } - break; - - case 0x27: - // Paramètre divers - // b7 = CSM MODE - // b6 = 3 slot mode - // b5 = reset b - // b4 = reset a - // b3 = timer enable b - // b2 = timer enable a - // b1 = load b - // b0 = load a - - if ((data ^ YM2612.Mode) & 0x40) - { - // We changed the channel 2 mode, so recalculate phase step - // This fix the punch sound in Street of Rage 2 - - YM2612_Special_Update(); - - YM2612.CHANNEL[2].SLOT[0].Finc = -1; // recalculate phase step - } - -// if ((data & 2) && (YM2612.Status & 2)) YM2612.TimerBcnt = YM2612.TimerBL; -// if ((data & 1) && (YM2612.Status & 1)) YM2612.TimerAcnt = YM2612.TimerAL; - -// YM2612.Status &= (~data >> 4); // Reset du Status au cas ou c'est demandé - YM2612.Status &= (~data >> 4) & (data >> 2); // Reset Status - - YM2612.Mode = data; - -#if YM_DEBUG_LEVEL > 0 - fprintf(debug_file, "Mode reg = %.2X\n", data); -#endif - break; - - case 0x28: - if ((nch = data & 3) == 3) return 1; - - if (data & 4) nch += 3; - CH = &(YM2612.CHANNEL[nch]); - - YM2612_Special_Update(); - - if (data & 0x10) KEY_ON(CH, S0); // On appuie sur la touche pour le slot 1 - else KEY_OFF(CH, S0); // On relâche la touche pour le slot 1 - if (data & 0x20) KEY_ON(CH, S1); // On appuie sur la touche pour le slot 3 - else KEY_OFF(CH, S1); // On relâche la touche pour le slot 3 - if (data & 0x40) KEY_ON(CH, S2); // On appuie sur la touche pour le slot 2 - else KEY_OFF(CH, S2); // On relâche la touche pour le slot 2 - if (data & 0x80) KEY_ON(CH, S3); // On appuie sur la touche pour le slot 4 - else KEY_OFF(CH, S3); // On relâche la touche pour le slot 4 - -#if YM_DEBUG_LEVEL > 0 - fprintf(debug_file, "CHANNEL[%d] KEY %.1X\n", nch, ((data & 0xf0) >> 4)); -#endif - break; - - case 0x2A: - YM2612.DACdata = ((int) data - 0x80) << 7; // donnée du DAC - break; - - case 0x2B: - if (YM2612.DAC ^ (data & 0x80)) YM2612_Special_Update(); - - YM2612.DAC = data & 0x80; // activation/désactivation du DAC - break; - } - - return 0; -} - - - -/*********************************************** - * fonctions de génération * - ***********************************************/ - - -void Env_NULL_Next(slot_ *SL) -{ -} - - -void Env_Attack_Next(slot_ *SL) -{ - // Verified with Gynoug even in HQ (explode SFX) - SL->Ecnt = ENV_DECAY; - - SL->Einc = SL->EincD; - SL->Ecmp = SL->SLL; - SL->Ecurp = DECAY; -} - - -void Env_Decay_Next(slot_ *SL) -{ - // Verified with Gynoug even in HQ (explode SFX) - SL->Ecnt = SL->SLL; - - SL->Einc = SL->EincS; - SL->Ecmp = ENV_END; - SL->Ecurp = SUBSTAIN; -} - - -void Env_Substain_Next(slot_ *SL) -{ - if (SL->SEG & 8) // SSG envelope type - { - if (SL->SEG & 1) - { - SL->Ecnt = ENV_END; - SL->Einc = 0; - SL->Ecmp = ENV_END + 1; - } - else - { - // re KEY ON - - // SL->Fcnt = 0; - // SL->ChgEnM = 0xFFFFFFFF; - - SL->Ecnt = 0; - SL->Einc = SL->EincA; - SL->Ecmp = ENV_DECAY; - SL->Ecurp = ATTACK; - } - - SL->SEG ^= (SL->SEG & 2) << 1; - } - else - { - SL->Ecnt = ENV_END; - SL->Einc = 0; - SL->Ecmp = ENV_END + 1; - } -} - - -void Env_Release_Next(slot_ *SL) -{ - SL->Ecnt = ENV_END; - SL->Einc = 0; - SL->Ecmp = ENV_END + 1; -} - - -#define GET_CURRENT_PHASE \ -in0 = CH->SLOT[S0].Fcnt; \ -in1 = CH->SLOT[S1].Fcnt; \ -in2 = CH->SLOT[S2].Fcnt; \ -in3 = CH->SLOT[S3].Fcnt; - - -#define UPDATE_PHASE \ -CH->SLOT[S0].Fcnt += CH->SLOT[S0].Finc; \ -CH->SLOT[S1].Fcnt += CH->SLOT[S1].Finc; \ -CH->SLOT[S2].Fcnt += CH->SLOT[S2].Finc; \ -CH->SLOT[S3].Fcnt += CH->SLOT[S3].Finc; - - -#define UPDATE_PHASE_LFO \ -if ((freq_LFO = (CH->FMS * LFO_FREQ_UP[i]) >> (LFO_HBITS - 1))) \ -{ \ - CH->SLOT[S0].Fcnt += CH->SLOT[S0].Finc + ((CH->SLOT[S0].Finc * freq_LFO) >> LFO_FMS_LBITS); \ - CH->SLOT[S1].Fcnt += CH->SLOT[S1].Finc + ((CH->SLOT[S1].Finc * freq_LFO) >> LFO_FMS_LBITS); \ - CH->SLOT[S2].Fcnt += CH->SLOT[S2].Finc + ((CH->SLOT[S2].Finc * freq_LFO) >> LFO_FMS_LBITS); \ - CH->SLOT[S3].Fcnt += CH->SLOT[S3].Finc + ((CH->SLOT[S3].Finc * freq_LFO) >> LFO_FMS_LBITS); \ -} \ -else \ -{ \ - CH->SLOT[S0].Fcnt += CH->SLOT[S0].Finc; \ - CH->SLOT[S1].Fcnt += CH->SLOT[S1].Finc; \ - CH->SLOT[S2].Fcnt += CH->SLOT[S2].Finc; \ - CH->SLOT[S3].Fcnt += CH->SLOT[S3].Finc; \ -} - - -#define GET_CURRENT_ENV \ -if (CH->SLOT[S0].SEG & 4) \ -{ \ - if ((en0 = ENV_TAB[(CH->SLOT[S0].Ecnt >> ENV_LBITS)] + CH->SLOT[S0].TLL) > ENV_MASK) en0 = 0; \ - else en0 ^= ENV_MASK; \ -} \ -else en0 = ENV_TAB[(CH->SLOT[S0].Ecnt >> ENV_LBITS)] + CH->SLOT[S0].TLL; \ -if (CH->SLOT[S1].SEG & 4) \ -{ \ - if ((en1 = ENV_TAB[(CH->SLOT[S1].Ecnt >> ENV_LBITS)] + CH->SLOT[S1].TLL) > ENV_MASK) en1 = 0; \ - else en1 ^= ENV_MASK; \ -} \ -else en1 = ENV_TAB[(CH->SLOT[S1].Ecnt >> ENV_LBITS)] + CH->SLOT[S1].TLL; \ -if (CH->SLOT[S2].SEG & 4) \ -{ \ - if ((en2 = ENV_TAB[(CH->SLOT[S2].Ecnt >> ENV_LBITS)] + CH->SLOT[S2].TLL) > ENV_MASK) en2 = 0; \ - else en2 ^= ENV_MASK; \ -} \ -else en2 = ENV_TAB[(CH->SLOT[S2].Ecnt >> ENV_LBITS)] + CH->SLOT[S2].TLL; \ -if (CH->SLOT[S3].SEG & 4) \ -{ \ - if ((en3 = ENV_TAB[(CH->SLOT[S3].Ecnt >> ENV_LBITS)] + CH->SLOT[S3].TLL) > ENV_MASK) en3 = 0; \ - else en3 ^= ENV_MASK; \ -} \ -else en3 = ENV_TAB[(CH->SLOT[S3].Ecnt >> ENV_LBITS)] + CH->SLOT[S3].TLL; - - -#define GET_CURRENT_ENV_LFO \ -env_LFO = LFO_ENV_UP[i]; \ - \ -if (CH->SLOT[S0].SEG & 4) \ -{ \ - if ((en0 = ENV_TAB[(CH->SLOT[S0].Ecnt >> ENV_LBITS)] + CH->SLOT[S0].TLL) > ENV_MASK) en0 = 0; \ - else en0 = (en0 ^ ENV_MASK) + (env_LFO >> CH->SLOT[S0].AMS); \ -} \ -else en0 = ENV_TAB[(CH->SLOT[S0].Ecnt >> ENV_LBITS)] + CH->SLOT[S0].TLL + (env_LFO >> CH->SLOT[S0].AMS); \ -if (CH->SLOT[S1].SEG & 4) \ -{ \ - if ((en1 = ENV_TAB[(CH->SLOT[S1].Ecnt >> ENV_LBITS)] + CH->SLOT[S1].TLL) > ENV_MASK) en1 = 0; \ - else en1 = (en1 ^ ENV_MASK) + (env_LFO >> CH->SLOT[S1].AMS); \ -} \ -else en1 = ENV_TAB[(CH->SLOT[S1].Ecnt >> ENV_LBITS)] + CH->SLOT[S1].TLL + (env_LFO >> CH->SLOT[S1].AMS); \ -if (CH->SLOT[S2].SEG & 4) \ -{ \ - if ((en2 = ENV_TAB[(CH->SLOT[S2].Ecnt >> ENV_LBITS)] + CH->SLOT[S2].TLL) > ENV_MASK) en2 = 0; \ - else en2 = (en2 ^ ENV_MASK) + (env_LFO >> CH->SLOT[S2].AMS); \ -} \ -else en2 = ENV_TAB[(CH->SLOT[S2].Ecnt >> ENV_LBITS)] + CH->SLOT[S2].TLL + (env_LFO >> CH->SLOT[S2].AMS); \ -if (CH->SLOT[S3].SEG & 4) \ -{ \ - if ((en3 = ENV_TAB[(CH->SLOT[S3].Ecnt >> ENV_LBITS)] + CH->SLOT[S3].TLL) > ENV_MASK) en3 = 0; \ - else en3 = (en3 ^ ENV_MASK) + (env_LFO >> CH->SLOT[S3].AMS); \ -} \ -else en3 = ENV_TAB[(CH->SLOT[S3].Ecnt >> ENV_LBITS)] + CH->SLOT[S3].TLL + (env_LFO >> CH->SLOT[S3].AMS); - - -#define UPDATE_ENV \ -if ((CH->SLOT[S0].Ecnt += CH->SLOT[S0].Einc) >= CH->SLOT[S0].Ecmp) \ - ENV_NEXT_EVENT[CH->SLOT[S0].Ecurp](&(CH->SLOT[S0])); \ -if ((CH->SLOT[S1].Ecnt += CH->SLOT[S1].Einc) >= CH->SLOT[S1].Ecmp) \ - ENV_NEXT_EVENT[CH->SLOT[S1].Ecurp](&(CH->SLOT[S1])); \ -if ((CH->SLOT[S2].Ecnt += CH->SLOT[S2].Einc) >= CH->SLOT[S2].Ecmp) \ - ENV_NEXT_EVENT[CH->SLOT[S2].Ecurp](&(CH->SLOT[S2])); \ -if ((CH->SLOT[S3].Ecnt += CH->SLOT[S3].Einc) >= CH->SLOT[S3].Ecmp) \ - ENV_NEXT_EVENT[CH->SLOT[S3].Ecurp](&(CH->SLOT[S3])); - - -#define DO_LIMIT \ -if (CH->OUTd > LIMIT_CH_OUT) CH->OUTd = LIMIT_CH_OUT; \ -else if (CH->OUTd < -LIMIT_CH_OUT) CH->OUTd = -LIMIT_CH_OUT; - - -#define DO_FEEDBACK0 \ -in0 += CH->S0_OUT[0] >> CH->FB; \ -CH->S0_OUT[0] = SIN_TAB[(in0 >> SIN_LBITS) & SIN_MASK][en0]; - - -#define DO_FEEDBACK \ -in0 += (CH->S0_OUT[0] + CH->S0_OUT[1]) >> CH->FB; \ -CH->S0_OUT[1] = CH->S0_OUT[0]; \ -CH->S0_OUT[0] = SIN_TAB[(in0 >> SIN_LBITS) & SIN_MASK][en0]; - - -#define DO_FEEDBACK2 \ -in0 += (CH->S0_OUT[0] + (CH->S0_OUT[0] >> 2) + CH->S0_OUT[1]) >> CH->FB; \ -CH->S0_OUT[1] = CH->S0_OUT[0] >> 2; \ -CH->S0_OUT[0] = SIN_TAB[(in0 >> SIN_LBITS) & SIN_MASK][en0]; - - -#define DO_FEEDBACK3 \ -in0 += (CH->S0_OUT[0] + CH->S0_OUT[1] + CH->S0_OUT[2] + CH->S0_OUT[3]) >> CH->FB; \ -CH->S0_OUT[3] = CH->S0_OUT[2] >> 1; \ -CH->S0_OUT[2] = CH->S0_OUT[1] >> 1; \ -CH->S0_OUT[1] = CH->S0_OUT[0] >> 1; \ -CH->S0_OUT[0] = SIN_TAB[(in0 >> SIN_LBITS) & SIN_MASK][en0]; - - -#define DO_ALGO_0 \ -DO_FEEDBACK \ -in1 += CH->S0_OUT[1]; \ -in2 += SIN_TAB[(in1 >> SIN_LBITS) & SIN_MASK][en1]; \ -in3 += SIN_TAB[(in2 >> SIN_LBITS) & SIN_MASK][en2]; \ -CH->OUTd = (SIN_TAB[(in3 >> SIN_LBITS) & SIN_MASK][en3]) >> OUT_SHIFT; - -#define DO_ALGO_1 \ -DO_FEEDBACK \ -in2 += CH->S0_OUT[1] + SIN_TAB[(in1 >> SIN_LBITS) & SIN_MASK][en1]; \ -in3 += SIN_TAB[(in2 >> SIN_LBITS) & SIN_MASK][en2]; \ -CH->OUTd = (SIN_TAB[(in3 >> SIN_LBITS) & SIN_MASK][en3]) >> OUT_SHIFT; - -#define DO_ALGO_2 \ -DO_FEEDBACK \ -in2 += SIN_TAB[(in1 >> SIN_LBITS) & SIN_MASK][en1]; \ -in3 += CH->S0_OUT[1] + SIN_TAB[(in2 >> SIN_LBITS) & SIN_MASK][en2]; \ -CH->OUTd = (SIN_TAB[(in3 >> SIN_LBITS) & SIN_MASK][en3]) >> OUT_SHIFT; - -#define DO_ALGO_3 \ -DO_FEEDBACK \ -in1 += CH->S0_OUT[1]; \ -in3 += SIN_TAB[(in1 >> SIN_LBITS) & SIN_MASK][en1] + SIN_TAB[(in2 >> SIN_LBITS) & SIN_MASK][en2]; \ -CH->OUTd = (SIN_TAB[(in3 >> SIN_LBITS) & SIN_MASK][en3]) >> OUT_SHIFT; - -#define DO_ALGO_4 \ -DO_FEEDBACK \ -in1 += CH->S0_OUT[1]; \ -in3 += SIN_TAB[(in2 >> SIN_LBITS) & SIN_MASK][en2]; \ -CH->OUTd = ((int) SIN_TAB[(in3 >> SIN_LBITS) & SIN_MASK][en3] + (int) SIN_TAB[(in1 >> SIN_LBITS) & SIN_MASK][en1]) >> OUT_SHIFT; \ -DO_LIMIT - -#define DO_ALGO_5 \ -DO_FEEDBACK \ -in1 += CH->S0_OUT[1]; \ -in2 += CH->S0_OUT[1]; \ -in3 += CH->S0_OUT[1]; \ -CH->OUTd = ((int) SIN_TAB[(in3 >> SIN_LBITS) & SIN_MASK][en3] + (int) SIN_TAB[(in1 >> SIN_LBITS) & SIN_MASK][en1] + (int) SIN_TAB[(in2 >> SIN_LBITS) & SIN_MASK][en2]) >> OUT_SHIFT; \ -DO_LIMIT - -#define DO_ALGO_6 \ -DO_FEEDBACK \ -in1 += CH->S0_OUT[1]; \ -CH->OUTd = ((int) SIN_TAB[(in3 >> SIN_LBITS) & SIN_MASK][en3] + (int) SIN_TAB[(in1 >> SIN_LBITS) & SIN_MASK][en1] + (int) SIN_TAB[(in2 >> SIN_LBITS) & SIN_MASK][en2]) >> OUT_SHIFT; \ -DO_LIMIT - -#define DO_ALGO_7 \ -DO_FEEDBACK \ -CH->OUTd = ((int) SIN_TAB[(in3 >> SIN_LBITS) & SIN_MASK][en3] + (int) SIN_TAB[(in1 >> SIN_LBITS) & SIN_MASK][en1] + (int) SIN_TAB[(in2 >> SIN_LBITS) & SIN_MASK][en2] + CH->S0_OUT[1]) >> OUT_SHIFT; \ -DO_LIMIT - - -#define DO_OUTPUT \ -buf[0][i] += CH->OUTd & CH->LEFT; \ -buf[1][i] += CH->OUTd & CH->RIGHT; - - -#define DO_OUTPUT_INT0 \ -if ((int_cnt += YM2612.Inter_Step) & 0x04000) \ -{ \ - int_cnt &= 0x3FFF; \ - buf[0][i] += CH->OUTd & CH->LEFT; \ - buf[1][i] += CH->OUTd & CH->RIGHT; \ -} \ -else i--; - - -#define DO_OUTPUT_INT1 \ -CH->Old_OUTd = (CH->OUTd + CH->Old_OUTd) >> 1; \ -if ((int_cnt += YM2612.Inter_Step) & 0x04000) \ -{ \ - int_cnt &= 0x3FFF; \ - buf[0][i] += CH->Old_OUTd & CH->LEFT; \ - buf[1][i] += CH->Old_OUTd & CH->RIGHT; \ -} \ -else i--; - - -#define DO_OUTPUT_INT2 \ -if ((int_cnt += YM2612.Inter_Step) & 0x04000) \ -{ \ - int_cnt &= 0x3FFF; \ - CH->Old_OUTd = (CH->OUTd + CH->Old_OUTd) >> 1; \ - buf[0][i] += CH->Old_OUTd & CH->LEFT; \ - buf[1][i] += CH->Old_OUTd & CH->RIGHT; \ -} \ -else i--; \ -CH->Old_OUTd = CH->OUTd; - - -#define DO_OUTPUT_INT \ -if ((int_cnt += YM2612.Inter_Step) & 0x04000) \ -{ \ - int_cnt &= 0x3FFF; \ - CH->Old_OUTd = (((int_cnt ^ 0x3FFF) * CH->OUTd) + (int_cnt * CH->Old_OUTd)) >> 14; \ - buf[0][i] += CH->Old_OUTd & CH->LEFT; \ - buf[1][i] += CH->Old_OUTd & CH->RIGHT; \ -} \ -else i--; \ -CH->Old_OUTd = CH->OUTd; - - -void Update_Chan_Algo0(channel_ *CH, int **buf, int lenght) -{ - int i; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 0 len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_0 - DO_OUTPUT - } -} - - -void Update_Chan_Algo1(channel_ *CH, int **buf, int lenght) -{ - int i; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 1 len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_1 - DO_OUTPUT - } -} - - -void Update_Chan_Algo2(channel_ *CH, int **buf, int lenght) -{ - int i; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 2 len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_2 - DO_OUTPUT - } -} - - -void Update_Chan_Algo3(channel_ *CH, int **buf, int lenght) -{ - int i; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 3 len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_3 - DO_OUTPUT - } -} - - -void Update_Chan_Algo4(channel_ *CH, int **buf, int lenght) -{ - int i; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 4 len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_4 - DO_OUTPUT - } -} - - -void Update_Chan_Algo5(channel_ *CH, int **buf, int lenght) -{ - int i; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 5 len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_5 - DO_OUTPUT - } -} - - -void Update_Chan_Algo6(channel_ *CH, int **buf, int lenght) -{ - int i; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 6 len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_6 - DO_OUTPUT - } -} - - -void Update_Chan_Algo7(channel_ *CH, int **buf, int lenght) -{ - int i; - - if ((CH->SLOT[S0].Ecnt == ENV_END) && (CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 7 len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_7 - DO_OUTPUT - } -} - - -void Update_Chan_Algo0_LFO(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 0 LFO len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_0 - DO_OUTPUT - } -} - - -void Update_Chan_Algo1_LFO(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 1 LFO len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_1 - DO_OUTPUT - } -} - - -void Update_Chan_Algo2_LFO(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 2 LFO len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_2 - DO_OUTPUT - } -} - - -void Update_Chan_Algo3_LFO(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 3 LFO len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_3 - DO_OUTPUT - } -} - - -void Update_Chan_Algo4_LFO(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 4 LFO len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_4 - DO_OUTPUT - } -} - - -void Update_Chan_Algo5_LFO(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 5 LFO len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_5 - DO_OUTPUT - } -} - - -void Update_Chan_Algo6_LFO(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 6 LFO len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_6 - DO_OUTPUT - } -} - - -void Update_Chan_Algo7_LFO(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if ((CH->SLOT[S0].Ecnt == ENV_END) && (CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 7 LFO len = %d\n\n", lenght); -#endif - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_7 - DO_OUTPUT - } -} - - -/****************************************************** - * Interpolated output * - *****************************************************/ - - -void Update_Chan_Algo0_Int(channel_ *CH, int **buf, int lenght) -{ - int i; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 0 len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_0 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo1_Int(channel_ *CH, int **buf, int lenght) -{ - int i; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 1 len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_1 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo2_Int(channel_ *CH, int **buf, int lenght) -{ - int i; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 2 len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_2 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo3_Int(channel_ *CH, int **buf, int lenght) -{ - int i; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 3 len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_3 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo4_Int(channel_ *CH, int **buf, int lenght) -{ - int i; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 4 len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_4 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo5_Int(channel_ *CH, int **buf, int lenght) -{ - int i; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 5 len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_5 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo6_Int(channel_ *CH, int **buf, int lenght) -{ - int i; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 6 len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_6 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo7_Int(channel_ *CH, int **buf, int lenght) -{ - int i; - - if ((CH->SLOT[S0].Ecnt == ENV_END) && (CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 7 len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE - GET_CURRENT_ENV - UPDATE_ENV - DO_ALGO_7 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo0_LFO_Int(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 0 LFO len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_0 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo1_LFO_Int(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 1 LFO len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_1 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo2_LFO_Int(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 2 LFO len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_2 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo3_LFO_Int(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if (CH->SLOT[S3].Ecnt == ENV_END) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 3 LFO len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_3 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo4_LFO_Int(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 4 LFO len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_4 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo5_LFO_Int(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 5 LFO len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_5 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo6_LFO_Int(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if ((CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 6 LFO len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_6 - DO_OUTPUT_INT - } -} - - -void Update_Chan_Algo7_LFO_Int(channel_ *CH, int **buf, int lenght) -{ - int i, env_LFO, freq_LFO; - - if ((CH->SLOT[S0].Ecnt == ENV_END) && (CH->SLOT[S1].Ecnt == ENV_END) && (CH->SLOT[S2].Ecnt == ENV_END) && (CH->SLOT[S3].Ecnt == ENV_END)) return; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nAlgo 7 LFO len = %d\n\n", lenght); -#endif - - int_cnt = YM2612.Inter_Cnt; - - for(i = 0; i < lenght; i++) - { - GET_CURRENT_PHASE - UPDATE_PHASE_LFO - GET_CURRENT_ENV_LFO - UPDATE_ENV - DO_ALGO_7 - DO_OUTPUT_INT - } -} - - - -/*********************************************** - * fonctions publiques * - ***********************************************/ - - -// Initialisation de l'émulateur YM2612 -int YM2612_Init(int Clock, int Rate, int Interpolation) -{ - int i, j; - double x; - - if ((Rate == 0) || (Clock == 0)) return 1; - - memset(&YM2612, 0, sizeof(YM2612)); - -#if YM_DEBUG_LEVEL > 0 - if (debug_file == NULL) - { - debug_file = fopen("ym2612.log", "w"); - fprintf(debug_file, "YM2612 logging :\n\n"); - } -#endif - - YM2612.Clock = Clock; - YM2612.Rate = Rate; - - // 144 = 12 * (prescale * 2) = 12 * 6 * 2 - // prescale set to 6 by default - - YM2612.Frequence = ((double) YM2612.Clock / (double) YM2612.Rate) / 144.0; - YM2612.TimerBase = (int) (YM2612.Frequence * 4096.0); - - if ((Interpolation) && (YM2612.Frequence > 1.0)) - { - YM2612.Inter_Step = (unsigned int) ((1.0 / YM2612.Frequence) * (double) (0x4000)); - YM2612.Inter_Cnt = 0; - - // We recalculate rate and frequence after interpolation - - YM2612.Rate = YM2612.Clock / 144; - YM2612.Frequence = 1.0; - } - else - { - YM2612.Inter_Step = 0x4000; - YM2612.Inter_Cnt = 0; - } - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "YM2612 frequence = %g rate = %d interp step = %.8X\n\n", YM2612.Frequence, YM2612.Rate, YM2612.Inter_Step); -#endif - - // Tableau TL : - // [0 - 4095] = +output [4095 - ...] = +output overflow (fill with 0) - // [12288 - 16383] = -output [16384 - ...] = -output overflow (fill with 0) - - for(i = 0; i < TL_LENGHT; i++) - { - if (i >= PG_CUT_OFF) // YM2612 cut off sound after 78 dB (14 bits output ?) - { - TL_TAB[TL_LENGHT + i] = TL_TAB[i] = 0; - } - else - { - x = MAX_OUT; // Max output - x /= pow(10, (ENV_STEP * i) / 20); // Decibel -> Voltage - - TL_TAB[i] = (int) x; - TL_TAB[TL_LENGHT + i] = -TL_TAB[i]; - } - -#if YM_DEBUG_LEVEL > 2 - fprintf(debug_file, "TL_TAB[%d] = %.8X TL_TAB[%d] = %.8X\n", i, TL_TAB[i], TL_LENGHT + i, TL_TAB[TL_LENGHT + i]); -#endif - } - -#if YM_DEBUG_LEVEL > 2 - fprintf(debug_file, "\n\n\n\n"); -#endif - - // Tableau SIN : - // SIN_TAB[x][y] = sin(x) * y; - // x = phase and y = volume - - SIN_TAB[0] = SIN_TAB[SIN_LENGHT / 2] = &TL_TAB[(int)PG_CUT_OFF]; - - for(i = 1; i <= SIN_LENGHT / 4; i++) - { - x = sin(2.0 * PI * (double) (i) / (double) (SIN_LENGHT)); // Sinus - x = 20 * log10(1 / x); // convert to dB - - j = (int) (x / ENV_STEP); // Get TL range - - if (j > PG_CUT_OFF) j = (int) PG_CUT_OFF; - - SIN_TAB[i] = SIN_TAB[(SIN_LENGHT / 2) - i] = &TL_TAB[j]; - SIN_TAB[(SIN_LENGHT / 2) + i] = SIN_TAB[SIN_LENGHT - i] = &TL_TAB[TL_LENGHT + j]; - -#if YM_DEBUG_LEVEL > 2 - fprintf(debug_file, "SIN[%d][0] = %.8X SIN[%d][0] = %.8X SIN[%d][0] = %.8X SIN[%d][0] = %.8X\n", i, SIN_TAB[i][0], (SIN_LENGHT / 2) - i, SIN_TAB[(SIN_LENGHT / 2) - i][0], (SIN_LENGHT / 2) + i, SIN_TAB[(SIN_LENGHT / 2) + i][0], SIN_LENGHT - i, SIN_TAB[SIN_LENGHT - i][0]); -#endif - } - -#if YM_DEBUG_LEVEL > 2 - fprintf(debug_file, "\n\n\n\n"); -#endif - - // Tableau LFO (LFO wav) : - - for(i = 0; i < LFO_LENGHT; i++) - { - x = sin(2.0 * PI * (double) (i) / (double) (LFO_LENGHT)); // Sinus - x += 1.0; - x /= 2.0; // positive only - x *= 11.8 / ENV_STEP; // ajusted to MAX enveloppe modulation - - LFO_ENV_TAB[i] = (int) x; - - x = sin(2.0 * PI * (double) (i) / (double) (LFO_LENGHT)); // Sinus - x *= (double) ((1 << (LFO_HBITS - 1)) - 1); - - LFO_FREQ_TAB[i] = (int) x; - -#if YM_DEBUG_LEVEL > 2 - fprintf(debug_file, "LFO[%d] = %.8X\n", i, LFO_ENV_TAB[i]); -#endif - } - -#if YM_DEBUG_LEVEL > 2 - fprintf(debug_file, "\n\n\n\n"); -#endif - - // Tableau Enveloppe : - // ENV_TAB[0] -> ENV_TAB[ENV_LENGHT - 1] = attack curve - // ENV_TAB[ENV_LENGHT] -> ENV_TAB[2 * ENV_LENGHT - 1] = decay curve - - for(i = 0; i < ENV_LENGHT; i++) - { - // Attack curve (x^8 - music level 2 Vectorman 2) - x = pow(((double) ((ENV_LENGHT - 1) - i) / (double) (ENV_LENGHT)), 8); - x *= ENV_LENGHT; - - ENV_TAB[i] = (int) x; - - // Decay curve (just linear) - x = pow(((double) (i) / (double) (ENV_LENGHT)), 1); - x *= ENV_LENGHT; - - ENV_TAB[ENV_LENGHT + i] = (int) x; - -#if YM_DEBUG_LEVEL > 2 - fprintf(debug_file, "ATTACK[%d] = %d DECAY[%d] = %d\n", i, ENV_TAB[i], i, ENV_TAB[ENV_LENGHT + i]); -#endif - } - - ENV_TAB[ENV_END >> ENV_LBITS] = ENV_LENGHT - 1; // for the stopped state - - // Tableau pour la conversion Attack -> Decay and Decay -> Attack - - for(i = 0, j = ENV_LENGHT - 1; i < ENV_LENGHT; i++) - { - while (j && (ENV_TAB[j] < (unsigned) i)) j--; - - DECAY_TO_ATTACK[i] = j << ENV_LBITS; - } - - // Tableau pour le Substain Level - - for(i = 0; i < 15; i++) - { - x = i * 3; // 3 and not 6 (Mickey Mania first music for test) - x /= ENV_STEP; - - j = (int) x; - j <<= ENV_LBITS; - - SL_TAB[i] = j + ENV_DECAY; - } - - j = ENV_LENGHT - 1; // special case : volume off - j <<= ENV_LBITS; - SL_TAB[15] = j + ENV_DECAY; - - // Tableau Frequency Step - - for(i = 0; i < 2048; i++) - { - x = (double) (i) * YM2612.Frequence; - -#if ((SIN_LBITS + SIN_HBITS - (21 - 7)) < 0) - x /= (double) (1 << ((21 - 7) - SIN_LBITS - SIN_HBITS)); -#else - x *= (double) (1 << (SIN_LBITS + SIN_HBITS - (21 - 7))); -#endif - - x /= 2.0; // because MUL = value * 2 - - FINC_TAB[i] = (unsigned int) x; - } - - // Tableaux Attack & Decay Rate - - for(i = 0; i < 4; i++) - { - AR_TAB[i] = 0; - DR_TAB[i] = 0; - } - - for(i = 0; i < 60; i++) - { - x = YM2612.Frequence; - - x *= 1.0 + ((i & 3) * 0.25); // bits 0-1 : x1.00, x1.25, x1.50, x1.75 - x *= (double) (1 << ((i >> 2))); // bits 2-5 : shift bits (x2^0 - x2^15) - x *= (double) (ENV_LENGHT << ENV_LBITS); // on ajuste pour le tableau ENV_TAB - - AR_TAB[i + 4] = (unsigned int) (x / AR_RATE); - DR_TAB[i + 4] = (unsigned int) (x / DR_RATE); - } - - for(i = 64; i < 96; i++) - { - AR_TAB[i] = AR_TAB[63]; - DR_TAB[i] = DR_TAB[63]; - - NULL_RATE[i - 64] = 0; - } - - // Tableau Detune - - for(i = 0; i < 4; i++) - { - for (j = 0; j < 32; j++) - { -#if ((SIN_LBITS + SIN_HBITS - 21) < 0) - x = (double) DT_DEF_TAB[(i << 5) + j] * YM2612.Frequence / (double) (1 << (21 - SIN_LBITS - SIN_HBITS)); -#else - x = (double) DT_DEF_TAB[(i << 5) + j] * YM2612.Frequence * (double) (1 << (SIN_LBITS + SIN_HBITS - 21)); -#endif - - DT_TAB[i + 0][j] = (int) x; - DT_TAB[i + 4][j] = (int) -x; - } - } - - // Tableau LFO - - j = (YM2612.Rate * YM2612.Inter_Step) / 0x4000; - - LFO_INC_TAB[0] = (unsigned int) (3.98 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j); - LFO_INC_TAB[1] = (unsigned int) (5.56 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j); - LFO_INC_TAB[2] = (unsigned int) (6.02 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j); - LFO_INC_TAB[3] = (unsigned int) (6.37 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j); - LFO_INC_TAB[4] = (unsigned int) (6.88 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j); - LFO_INC_TAB[5] = (unsigned int) (9.63 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j); - LFO_INC_TAB[6] = (unsigned int) (48.1 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j); - LFO_INC_TAB[7] = (unsigned int) (72.2 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j); - - YM2612_Reset(); - - return 0; -} - - -int YM2612_End(void) -{ - -#if YM_DEBUG_LEVEL > 0 - if (debug_file) fclose(debug_file); - debug_file = NULL; -#endif - - return 0; -} - - -int YM2612_Reset(void) -{ - int i, j; - -#if YM_DEBUG_LEVEL > 0 - fprintf(debug_file, "\n\nStarting reseting YM2612 ...\n\n"); -#endif - - YM2612.LFOcnt = 0; - YM2612.TimerA = 0; - YM2612.TimerAL = 0; - YM2612.TimerAcnt = 0; - YM2612.TimerB = 0; - YM2612.TimerBL = 0; - YM2612.TimerBcnt = 0; - YM2612.DAC = 0; - YM2612.DACdata = 0; - - YM2612.Status = 0; - - YM2612.OPNAadr = 0; - YM2612.OPNBadr = 0; - YM2612.Inter_Cnt = 0; - - for(i = 0; i < 6; i++) - { - YM2612.CHANNEL[i].Old_OUTd = 0; - YM2612.CHANNEL[i].OUTd = 0; - YM2612.CHANNEL[i].LEFT = 0xFFFFFFFF; - YM2612.CHANNEL[i].RIGHT = 0xFFFFFFFF; - YM2612.CHANNEL[i].ALGO = 0;; - YM2612.CHANNEL[i].FB = 31; - YM2612.CHANNEL[i].FMS = 0; - YM2612.CHANNEL[i].AMS = 0; - - for(j = 0 ;j < 4 ; j++) - { - YM2612.CHANNEL[i].S0_OUT[j] = 0; - YM2612.CHANNEL[i].FNUM[j] = 0; - YM2612.CHANNEL[i].FOCT[j] = 0; - YM2612.CHANNEL[i].KC[j] = 0; - - YM2612.CHANNEL[i].SLOT[j].Fcnt = 0; - YM2612.CHANNEL[i].SLOT[j].Finc = 0; - YM2612.CHANNEL[i].SLOT[j].Ecnt = ENV_END; // Put it at the end of Decay phase... - YM2612.CHANNEL[i].SLOT[j].Einc = 0; - YM2612.CHANNEL[i].SLOT[j].Ecmp = 0; - YM2612.CHANNEL[i].SLOT[j].Ecurp = RELEASE; - - YM2612.CHANNEL[i].SLOT[j].ChgEnM = 0; - } - } - - for(i = 0; i < 0x100; i++) - { - YM2612.REG[0][i] = -1; - YM2612.REG[1][i] = -1; - } - - for(i = 0xB6; i >= 0xB4; i--) - { - YM2612_Write(0, (unsigned char) i); - YM2612_Write(2, (unsigned char) i); - YM2612_Write(1, 0xC0); - YM2612_Write(3, 0xC0); - } - - for(i = 0xB2; i >= 0x22; i--) - { - YM2612_Write(0, (unsigned char) i); - YM2612_Write(2, (unsigned char) i); - YM2612_Write(1, 0); - YM2612_Write(3, 0); - } - - YM2612_Write(0, 0x2A); - YM2612_Write(1, 0x80); - -#if YM_DEBUG_LEVEL > 0 - fprintf(debug_file, "\n\nFinishing reseting YM2612 ...\n\n"); -#endif - - return 0; -} - - -int YM2612_Read(void) -{ -/* static int cnt = 0; - - if (cnt++ == 50) - { - cnt = 0; - return YM2612.Status; - } - else return YM2612.Status | 0x80; -*/ - return YM2612.Status; -} - - -int YM2612_Write(unsigned char adr, unsigned char data) -{ - int d; - - data &= 0xFF; - adr &= 0x3; - - switch(adr) - { - case 0: - YM2612.OPNAadr = data; - break; - - case 1: - // Trivial optimisation - - if (YM2612.OPNAadr == 0x2A) - { - YM2612.DACdata = ((int) data - 0x80) << 7; - return 0; - } - - d = YM2612.OPNAadr & 0xF0; - - if (d >= 0x30) - { - if (YM2612.REG[0][YM2612.OPNAadr] == data) return 2; - YM2612.REG[0][YM2612.OPNAadr] = data; - - if (GYM_Dumping) Update_GYM_Dump(1, YM2612.OPNAadr, data); - - if (d < 0xA0) // SLOT - { - SLOT_SET(YM2612.OPNAadr, data); - } - else // CHANNEL - { - CHANNEL_SET(YM2612.OPNAadr, data); - } - } - else // YM2612 - { - YM2612.REG[0][YM2612.OPNAadr] = data; - - if ((GYM_Dumping) && ((YM2612.OPNAadr == 0x22) || (YM2612.OPNAadr == 0x27) || (YM2612.OPNAadr == 0x28))) Update_GYM_Dump(1, YM2612.OPNAadr, data); - - YM_SET(YM2612.OPNAadr, data); - } - break; - - case 2: - YM2612.OPNBadr = data; - break; - - case 3: - d = YM2612.OPNBadr & 0xF0; - - if (d >= 0x30) - { - if (YM2612.REG[1][YM2612.OPNBadr] == data) return 2; - YM2612.REG[1][YM2612.OPNBadr] = data; - - if (GYM_Dumping) Update_GYM_Dump(2, YM2612.OPNBadr, data); - - if (d < 0xA0) // SLOT - { - SLOT_SET(YM2612.OPNBadr + 0x100, data); - } - else // CHANNEL - { - CHANNEL_SET(YM2612.OPNBadr + 0x100, data); - } - } - else return 1; - break; - } - - return 0; -} - - -void YM2612_Update(int **buf, int length) -{ - int i, j, algo_type; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nStarting generating sound...\n\n"); -#endif - - // Mise à jour des pas des compteurs-fréquences s'ils ont été modifiés - - if (YM2612.CHANNEL[0].SLOT[0].Finc == -1) CALC_FINC_CH(&YM2612.CHANNEL[0]); - if (YM2612.CHANNEL[1].SLOT[0].Finc == -1) CALC_FINC_CH(&YM2612.CHANNEL[1]); - if (YM2612.CHANNEL[2].SLOT[0].Finc == -1) - { - if (YM2612.Mode & 0x40) - { - CALC_FINC_SL(&(YM2612.CHANNEL[2].SLOT[S0]), FINC_TAB[YM2612.CHANNEL[2].FNUM[2]] >> (7 - YM2612.CHANNEL[2].FOCT[2]), YM2612.CHANNEL[2].KC[2]); - CALC_FINC_SL(&(YM2612.CHANNEL[2].SLOT[S1]), FINC_TAB[YM2612.CHANNEL[2].FNUM[3]] >> (7 - YM2612.CHANNEL[2].FOCT[3]), YM2612.CHANNEL[2].KC[3]); - CALC_FINC_SL(&(YM2612.CHANNEL[2].SLOT[S2]), FINC_TAB[YM2612.CHANNEL[2].FNUM[1]] >> (7 - YM2612.CHANNEL[2].FOCT[1]), YM2612.CHANNEL[2].KC[1]); - CALC_FINC_SL(&(YM2612.CHANNEL[2].SLOT[S3]), FINC_TAB[YM2612.CHANNEL[2].FNUM[0]] >> (7 - YM2612.CHANNEL[2].FOCT[0]), YM2612.CHANNEL[2].KC[0]); - } - else - { - CALC_FINC_CH(&YM2612.CHANNEL[2]); - } - } - if (YM2612.CHANNEL[3].SLOT[0].Finc == -1) CALC_FINC_CH(&YM2612.CHANNEL[3]); - if (YM2612.CHANNEL[4].SLOT[0].Finc == -1) CALC_FINC_CH(&YM2612.CHANNEL[4]); - if (YM2612.CHANNEL[5].SLOT[0].Finc == -1) CALC_FINC_CH(&YM2612.CHANNEL[5]); - -/* - CALC_FINC_CH(&YM2612.CHANNEL[0]); - CALC_FINC_CH(&YM2612.CHANNEL[1]); - if (YM2612.Mode & 0x40) - { - CALC_FINC_SL(&(YM2612.CHANNEL[2].SLOT[0]), FINC_TAB[YM2612.CHANNEL[2].FNUM[2]] >> (7 - YM2612.CHANNEL[2].FOCT[2]), YM2612.CHANNEL[2].KC[2]); - CALC_FINC_SL(&(YM2612.CHANNEL[2].SLOT[1]), FINC_TAB[YM2612.CHANNEL[2].FNUM[3]] >> (7 - YM2612.CHANNEL[2].FOCT[3]), YM2612.CHANNEL[2].KC[3]); - CALC_FINC_SL(&(YM2612.CHANNEL[2].SLOT[2]), FINC_TAB[YM2612.CHANNEL[2].FNUM[1]] >> (7 - YM2612.CHANNEL[2].FOCT[1]), YM2612.CHANNEL[2].KC[1]); - CALC_FINC_SL(&(YM2612.CHANNEL[2].SLOT[3]), FINC_TAB[YM2612.CHANNEL[2].FNUM[0]] >> (7 - YM2612.CHANNEL[2].FOCT[0]), YM2612.CHANNEL[2].KC[0]); - } - else - { - CALC_FINC_CH(&YM2612.CHANNEL[2]); - } - CALC_FINC_CH(&YM2612.CHANNEL[3]); - CALC_FINC_CH(&YM2612.CHANNEL[4]); - CALC_FINC_CH(&YM2612.CHANNEL[5]); -*/ - - if (YM2612.Inter_Step & 0x04000) algo_type = 0; - else algo_type = 16; - - if (YM2612.LFOinc) - { - // Precalcul LFO wav - - for(i = 0; i < length; i++) - { - j = ((YM2612.LFOcnt += YM2612.LFOinc) >> LFO_LBITS) & LFO_MASK; - - LFO_ENV_UP[i] = LFO_ENV_TAB[j]; - LFO_FREQ_UP[i] = LFO_FREQ_TAB[j]; - -#if YM_DEBUG_LEVEL > 3 - fprintf(debug_file, "LFO_ENV_UP[%d] = %d LFO_FREQ_UP[%d] = %d\n", i, LFO_ENV_UP[i], i, LFO_FREQ_UP[i]); -#endif - } - - algo_type |= 8; - } - - if (Chan_Enable[0]) UPDATE_CHAN[YM2612.CHANNEL[0].ALGO + algo_type](&(YM2612.CHANNEL[0]), buf, length); - if (Chan_Enable[1]) UPDATE_CHAN[YM2612.CHANNEL[1].ALGO + algo_type](&(YM2612.CHANNEL[1]), buf, length); - if (Chan_Enable[2]) UPDATE_CHAN[YM2612.CHANNEL[2].ALGO + algo_type](&(YM2612.CHANNEL[2]), buf, length); - if (Chan_Enable[3]) UPDATE_CHAN[YM2612.CHANNEL[3].ALGO + algo_type](&(YM2612.CHANNEL[3]), buf, length); - if (Chan_Enable[4]) UPDATE_CHAN[YM2612.CHANNEL[4].ALGO + algo_type](&(YM2612.CHANNEL[4]), buf, length); - if (Chan_Enable[5]) if (!(YM2612.DAC)) UPDATE_CHAN[YM2612.CHANNEL[5].ALGO + algo_type](&(YM2612.CHANNEL[5]), buf, length); - - YM2612.Inter_Cnt = int_cnt; - -#if YM_DEBUG_LEVEL > 1 - fprintf(debug_file, "\n\nFinishing generating sound...\n\n"); -#endif - -} - - -int YM2612_Save(unsigned char SAVE[0x200]) -{ - int i; - - for(i = 0; i < 0x100; i++) - { - SAVE[0x000 + i] = YM2612.REG[0][i]; - SAVE[0x100 + i] = YM2612.REG[1][i]; - } - - return 0; -} - - -int YM2612_Restore(unsigned char SAVE[0x200]) -{ - int i; - - YM2612_Reset(); - - for(i = 0; i < 0x100; i++) - { - YM2612_Write(0, (unsigned char) i); - YM2612_Write(1, SAVE[0x000 + i]); - YM2612_Write(2, (unsigned char) i); - YM2612_Write(3, SAVE[0x100 + i]); - } - - return 0; -} - -/* Gens */ - -void YM2612_DacAndTimers_Update(int **buffer, int length) -{ - int *bufL, *bufR; - int i; - - if (YM2612.DAC && YM2612.DACdata && DAC_Enable) - { - bufL = buffer[0]; - bufR = buffer[1]; - - for(i = 0; i < length; i++) - { - bufL[i] += YM2612.DACdata & YM2612.CHANNEL[5].LEFT; - bufR[i] += YM2612.DACdata & YM2612.CHANNEL[5].RIGHT; - } - } - - i = YM2612.TimerBase * length; - - if (YM2612.Mode & 1) // Timer A ON ? - { -// if ((YM2612.TimerAcnt -= 14073) <= 0) // 13879=NTSC (old: 14475=NTSC 14586=PAL) - if ((YM2612.TimerAcnt -= i) <= 0) - { - YM2612.Status |= (YM2612.Mode & 0x04) >> 2; - YM2612.TimerAcnt += YM2612.TimerAL; - -#if YM_DEBUG_LEVEL > 0 - fprintf(debug_file, "Counter A overflow\n"); -#endif - - if (YM2612.Mode & 0x80) CSM_Key_Control(); - } - } - - if (YM2612.Mode & 2) // Timer B ON ? - { -// if ((YM2612.TimerBcnt -= 14073) <= 0) // 13879=NTSC (old: 14475=NTSC 14586=PAL) - if ((YM2612.TimerBcnt -= i) <= 0) - { - YM2612.Status |= (YM2612.Mode & 0x08) >> 2; - YM2612.TimerBcnt += YM2612.TimerBL; - -#if YM_DEBUG_LEVEL > 0 - fprintf(debug_file, "Counter B overflow\n"); -#endif - } - } -} - - -void YM2612_Special_Update(void) -{ - if (YM_Len && YM2612_Enable) - { - YM2612_Update(YM_Buf, YM_Len); - - YM_Buf[0] = Seg_L + Sound_Extrapol[VDP_Current_Line + 1][0]; - YM_Buf[1] = Seg_R + Sound_Extrapol[VDP_Current_Line + 1][0]; - YM_Len = 0; - } -} - -#ifdef __PORT__ -int _YM2612_Reset(void) __attribute__ (( alias ("YM2612_Reset"))); -int _YM2612_Read(void) __attribute__ ((alias ("YM2612_Read"))); -int _YM2612_Write(unsigned char adr, unsigned char data) __attribute__ ((alias ("YM2612_Write"))); -#endif - -/* end */ diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/ym2612.h xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/ym2612.h --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec/ym2612.h 2010-05-24 03:51:13.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec/ym2612.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,199 +0,0 @@ -/*************************************************************************** - * Gens: Yamaha YM2612 FM synthesis chip emulator. * - * * - * Copyright (c) 1999-2002 by Stéphane Dallongeville * - * Copyright (c) 2003-2004 by Stéphane Akhoun * - * Copyright (c) 2008-2009 by David Korth * - * * - * This program is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by the * - * Free Software Foundation; either version 2 of the License, or (at your * - * option) any later version. * - * * - * This program is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License along * - * with this program; if not, write to the Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#ifndef _YM2612_H_ -#define _YM2612_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -// Change it if you need to do long update -#define MAX_UPDATE_LENGHT 2000 - -// Gens always uses 16 bits sound (in 32 bits buffer) and do the convertion later if needed. -#define OUTPUT_BITS 16 - -// VC++ inline -#define INLINE __inline - -typedef struct slot__ { - unsigned int *DT; // paramètre detune - int MUL; // paramètre "multiple de fréquence" - int TL; // Total Level = volume lorsque l'enveloppe est au plus haut - int TLL; // Total Level ajusted - int SLL; // Sustin Level (ajusted) = volume où l'enveloppe termine sa première phase de régression - int KSR_S; // Key Scale Rate Shift = facteur de prise en compte du KSL dans la variations de l'enveloppe - int KSR; // Key Scale Rate = cette valeur est calculée par rapport à la fréquence actuelle, elle va influer - // sur les différents paramètres de l'enveloppe comme l'attaque, le decay ... comme dans la réalité ! - int SEG; // Type enveloppe SSG - unsigned int *AR; // Attack Rate (table pointeur) = Taux d'attaque (AR[KSR]) - unsigned int *DR; // Decay Rate (table pointeur) = Taux pour la régression (DR[KSR]) - unsigned int *SR; // Sustin Rate (table pointeur) = Taux pour le maintien (SR[KSR]) - unsigned int *RR; // Release Rate (table pointeur) = Taux pour le relâchement (RR[KSR]) - int Fcnt; // Frequency Count = compteur-fréquence pour déterminer l'amplitude actuelle (SIN[Finc >> 16]) - int Finc; // frequency step = pas d'incrémentation du compteur-fréquence - // plus le pas est grand, plus la fréquence est aïgu (ou haute) - int Ecurp; // Envelope current phase = cette variable permet de savoir dans quelle phase - // de l'enveloppe on se trouve, par exemple phase d'attaque ou phase de maintenue ... - // en fonction de la valeur de cette variable, on va appeler une fonction permettant - // de mettre à jour l'enveloppe courante. - int Ecnt; // Envelope counter = le compteur-enveloppe permet de savoir où l'on se trouve dans l'enveloppe - int Einc; // Envelope step courant - int Ecmp; // Envelope counter limite pour la prochaine phase - int EincA; // Envelope step for Attack = pas d'incrémentation du compteur durant la phase d'attaque - // cette valeur est égal à AR[KSR] - int EincD; // Envelope step for Decay = pas d'incrémentation du compteur durant la phase de regression - // cette valeur est égal à DR[KSR] - int EincS; // Envelope step for Sustain = pas d'incrémentation du compteur durant la phase de maintenue - // cette valeur est égal à SR[KSR] - int EincR; // Envelope step for Release = pas d'incrémentation du compteur durant la phase de relâchement - // cette valeur est égal à RR[KSR] - int *OUTp; // pointeur of SLOT output = pointeur permettant de connecter la sortie de ce slot à l'entrée - // d'un autre ou carrement à la sortie de la voie - int INd; // input data of the slot = données en entrée du slot - int ChgEnM; // Change envelop mask. - int AMS; // AMS depth level of this SLOT = degré de modulation de l'amplitude par le LFO - int AMSon; // AMS enable flag = drapeau d'activation de l'AMS -} slot_; - -typedef struct channel__ { - int S0_OUT[4]; // anciennes sorties slot 0 (pour le feed back) - int Old_OUTd; // ancienne sortie de la voie (son brut) - int OUTd; // sortie de la voie (son brut) - int LEFT; // LEFT enable flag - int RIGHT; // RIGHT enable flag - int ALGO; // Algorythm = détermine les connections entre les opérateurs - int FB; // shift count of self feed back = degré de "Feed-Back" du SLOT 1 (il est son unique entrée) - int FMS; // Fréquency Modulation Sensitivity of channel = degré de modulation de la fréquence sur la voie par le LFO - int AMS; // Amplitude Modulation Sensitivity of channel = degré de modulation de l'amplitude sur la voie par le LFO - int FNUM[4]; // hauteur fréquence de la voie (+ 3 pour le mode spécial) - int FOCT[4]; // octave de la voie (+ 3 pour le mode spécial) - int KC[4]; // Key Code = valeur fonction de la fréquence (voir KSR pour les slots, KSR = KC >> KSR_S) - struct slot__ SLOT[4]; // four slot.operators = les 4 slots de la voie - int FFlag; // Frequency step recalculation flag -} channel_; - -typedef struct ym2612__ { - int Clock; // Horloge YM2612 - int Rate; // Sample Rate (11025/22050/44100) - int TimerBase; // TimerBase calculation - int Status; // YM2612 Status (timer overflow) - int OPNAadr; // addresse pour l'écriture dans l'OPN A (propre à l'émulateur) - int OPNBadr; // addresse pour l'écriture dans l'OPN B (propre à l'émulateur) - int LFOcnt; // LFO counter = compteur-fréquence pour le LFO - int LFOinc; // LFO step counter = pas d'incrémentation du compteur-fréquence du LFO - // plus le pas est grand, plus la fréquence est grande - int TimerA; // timerA limit = valeur jusqu'à laquelle le timer A doit compter - int TimerAL; - int TimerAcnt; // timerA counter = valeur courante du Timer A - int TimerB; // timerB limit = valeur jusqu'à laquelle le timer B doit compter - int TimerBL; - int TimerBcnt; // timerB counter = valeur courante du Timer B - int Mode; // Mode actuel des voie 3 et 6 (normal / spécial) - int DAC; // DAC enabled flag - int DACdata; // DAC data - double Frequence; // Fréquence de base, se calcul par rapport à l'horlage et au sample rate - unsigned int Inter_Cnt; // Interpolation Counter - unsigned int Inter_Step; // Interpolation Step - struct channel__ CHANNEL[6]; // Les 6 voies du YM2612 - int REG[2][0x100]; // Sauvegardes des valeurs de tout les registres, c'est facultatif - // cela nous rend le débuggage plus facile -} ym2612_; - -/* Gens */ - -extern int YM2612_Enable; -extern int YM2612_Improv; -extern int DAC_Enable; -extern int *YM_Buf[2]; -extern int YM_Len; - -extern int Chan_Enable[6]; - -/* end */ - -int YM2612_Init(int clock, int rate, int interpolation); -int YM2612_End(void); -int YM2612_Reset(void); -int YM2612_Read(void); -int YM2612_Write(unsigned char adr, unsigned char data); -void YM2612_Update(int **buf, int length); -int YM2612_Save(unsigned char SAVE[0x200]); -int YM2612_Restore(unsigned char SAVE[0x200]); - -/* Gens */ - -void YM2612_DacAndTimers_Update(int **buffer, int length); -void YM2612_Special_Update(void); - -/* end */ - -// used for foward... -void Update_Chan_Algo0(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo1(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo2(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo3(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo4(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo5(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo6(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo7(channel_ *CH, int **buf, int lenght); - -void Update_Chan_Algo0_LFO(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo1_LFO(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo2_LFO(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo3_LFO(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo4_LFO(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo5_LFO(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo6_LFO(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo7_LFO(channel_ *CH, int **buf, int lenght); - -void Update_Chan_Algo0_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo1_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo2_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo3_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo4_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo5_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo6_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo7_Int(channel_ *CH, int **buf, int lenght); - -void Update_Chan_Algo0_LFO_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo1_LFO_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo2_LFO_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo3_LFO_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo4_LFO_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo5_LFO_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo6_LFO_Int(channel_ *CH, int **buf, int lenght); -void Update_Chan_Algo7_LFO_Int(channel_ *CH, int **buf, int lenght); - -// used for foward... -void Env_Attack_Next(slot_ *SL); -void Env_Decay_Next(slot_ *SL); -void Env_Substain_Next(slot_ *SL); -void Env_Release_Next(slot_ *SL); -void Env_NULL_Next(slot_ *SL); - -#ifdef __cplusplus -}; -#endif - -#endif diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec.cpp xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec.cpp --- xbmc-10.00~svn33778/xbmc/cores/paplayer/GYMCodec.cpp 2009-09-20 09:39:41.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/GYMCodec.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2005-2008 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -#include "GYMCodec.h" -#include "cores/DllLoader/DllLoader.h" -#include "utils/log.h" - -GYMCodec::GYMCodec() -{ - m_CodecName = L"GYM"; - m_iDataInBuffer = 0; - m_szBuffer = NULL; - m_gym = 0; - m_iDataPos = 0; -} - -GYMCodec::~GYMCodec() -{ - DeInit(); -} - -bool GYMCodec::Init(const CStdString &strFile, unsigned int filecache) -{ - if (!m_dll.Load()) - return false; // error logged previously - - m_iBufferSize = m_dll.Init(); - - m_gym = m_dll.LoadGYM(strFile.c_str()); - if (!m_gym) - { - CLog::Log(LOGERROR,"GYMCodec: error opening file %s!",strFile.c_str()); - return false; - } - - m_Channels = 2; - m_SampleRate = 48000; - m_BitsPerSample = 16; - m_TotalTime = m_dll.GetLength(m_gym); - m_szBuffer = new char[m_iBufferSize]; - m_iDataPos = 0; - - return true; -} - -void GYMCodec::DeInit() -{ - if (m_gym) - m_dll.FreeGYM(m_gym); - m_gym = 0; - - if (m_szBuffer) - delete[] m_szBuffer; - m_szBuffer = NULL; -} - -__int64 GYMCodec::Seek(__int64 iSeekTime) -{ - m_dll.Seek(m_gym,(unsigned int) (iSeekTime/1000*60)); - - m_iDataPos = iSeekTime/1000*48000*4; - return iSeekTime; -} - -int GYMCodec::ReadPCM(BYTE *pBuffer, int size, int *actualsize) -{ - if (m_iDataPos >= m_TotalTime/1000*48000*4) - return READ_EOF; - - if (m_iDataInBuffer <= 0) - { - if (!m_dll.FillBuffer(m_gym,m_szBuffer)) - return READ_ERROR; - m_iDataInBuffer = m_iBufferSize; - m_szStartOfBuffer = m_szBuffer; - } - - *actualsize= size 0) { @@ -169,7 +169,7 @@ CLog::Log(LOGERROR, "MP3Codec: Unable to determine file format of %s (corrupt start of mp3?)", strFile.c_str()); goto error; } - if (bIsInternetStream) m_Bitrate = m_Formatdata[4]; + if (bTags) m_Bitrate = m_Formatdata[4]; } ; return true; diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp xbmc-10.00~svn34731/xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp --- xbmc-10.00~svn33778/xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp 2010-05-24 04:05:45.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp 2010-10-04 17:49:31.000000000 +0000 @@ -30,31 +30,31 @@ #include "src/version.h" #include "src/machine/nsf.h" - long __declspec(dllexport) DLL_LoadNSF(const char* szFileName) + __declspec(dllexport) void* DLL_LoadNSF(const char* szFileName) { nsf_init(); log_init(); nsf_t* result = nsf_load(const_cast(szFileName),NULL,0); - return (long)result; + return result; } - void __declspec(dllexport) DLL_FreeNSF(int nsf) + void __declspec(dllexport) DLL_FreeNSF(void* nsf) { nsf_t* pNsf = (nsf_t*)nsf; nsf_free(&pNsf); } - long __declspec(dllexport) DLL_GetTitle(int nsf) + __declspec(dllexport) char* DLL_GetTitle(void* nsf) { - return (long)((nsf_t*)nsf)->song_name; + return (char*)((nsf_t*)nsf)->song_name; } - long __declspec(dllexport) DLL_GetArtist(int nsf) + __declspec(dllexport) char* DLL_GetArtist(void* nsf) { - return (long)((nsf_t*)nsf)->artist_name; + return (char*)((nsf_t*)nsf)->artist_name; } - int __declspec(dllexport) DLL_StartPlayback(int nsf, int track) + int __declspec(dllexport) DLL_StartPlayback(void* nsf, int track) { nsf_playtrack((nsf_t*)nsf,track,48000,16,false); for (int i = 0; i < 6; i++) @@ -62,7 +62,7 @@ return 1; } - long __declspec(dllexport) DLL_FillBuffer(int nsf, char* buffer, int size) + long __declspec(dllexport) DLL_FillBuffer(void* nsf, char* buffer, int size) { nsf_t* pNsf = (nsf_t*)nsf; nsf_frame(pNsf); @@ -70,17 +70,17 @@ return size*2; } - void __declspec(dllexport) DLL_FrameAdvance(int nsf) + void __declspec(dllexport) DLL_FrameAdvance(void* nsf) { nsf_frame((nsf_t*)nsf); } - int __declspec(dllexport) DLL_GetPlaybackRate(int nsf) + int __declspec(dllexport) DLL_GetPlaybackRate(void* nsf) { return ((nsf_t*)nsf)->playback_rate; } - int __declspec(dllexport) DLL_GetNumberOfSongs(int nsf) + int __declspec(dllexport) DLL_GetNumberOfSongs(void* nsf) { return (int)((nsf_t*)nsf)->num_songs; } diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/NSFCodec.h xbmc-10.00~svn34731/xbmc/cores/paplayer/NSFCodec.h --- xbmc-10.00~svn33778/xbmc/cores/paplayer/NSFCodec.h 2008-05-17 22:18:44.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/NSFCodec.h 2010-10-04 17:49:31.000000000 +0000 @@ -39,7 +39,7 @@ private: int m_iTrack; - int m_nsf; + void* m_nsf; bool m_bIsPlaying; DllNosefart m_dll; diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/PAPlayer.cpp xbmc-10.00~svn34731/xbmc/cores/paplayer/PAPlayer.cpp --- xbmc-10.00~svn33778/xbmc/cores/paplayer/PAPlayer.cpp 2010-08-31 08:00:10.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/PAPlayer.cpp 2010-09-30 10:17:21.000000000 +0000 @@ -120,7 +120,7 @@ m_crossFading = g_guiSettings.GetInt("musicplayer.crossfade"); //WASAPI doesn't support multiple streams, no crossfading for cdda, cd-reading goes mad and no crossfading for last.fm doesn't like two connections - if (file.IsCDDA() || file.IsLastFM() || g_guiSettings.GetString("audiooutput.audiodevice").find("wasapi:") != CStdString::npos) m_crossFading = 0; + if (file.IsCDDA() || file.IsLastFM() || file.IsShoutCast() || g_guiSettings.GetString("audiooutput.audiodevice").find("wasapi:") != CStdString::npos) m_crossFading = 0; if (m_crossFading && IsPlaying()) { //do a short crossfade on trackskip diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/XBMCSID.cpp xbmc-10.00~svn34731/xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/XBMCSID.cpp --- xbmc-10.00~svn33778/xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/XBMCSID.cpp 2009-05-06 19:19:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/XBMCSID.cpp 2010-09-24 00:33:48.000000000 +0000 @@ -2,7 +2,7 @@ #include "../../../builders/resid-builder/include/sidplay/builders/resid.h" #ifdef _LINUX -#include "XSyncUtils.h" +#define __declspec(x) #else #include #endif @@ -14,32 +14,25 @@ SidTune tune; }; -HANDLE hMutex = NULL; - extern "C" { - int __declspec(dllexport) DLL_Init() + __declspec(dllexport) int DLL_Init() { - if (!hMutex) - hMutex = CreateMutex(NULL,false,NULL); return 0; } - long __declspec(dllexport) DLL_LoadSID(const char* szFileName) + __declspec(dllexport) void* DLL_LoadSID(const char* szFileName) { - WaitForSingleObject(hMutex,INFINITE); SSid* result = new SSid; result->tune.load(szFileName,true); result->config.sidEmulation = NULL; - ReleaseMutex(hMutex); - return (long)result; + return result; } - void __declspec(dllexport) DLL_StartPlayback(int sid, int track) + __declspec(dllexport) void DLL_StartPlayback(void* sid, int track) { - WaitForSingleObject(hMutex,INFINITE); SSid* result = (SSid*)sid; result->tune.selectSong(track); @@ -47,13 +40,13 @@ result->config.clockDefault = SID2_CLOCK_PAL; result->config.clockForced = false; result->config.clockSpeed = SID2_CLOCK_CORRECT; - result->config.emulateStereo = true; + result->config.emulateStereo = false; result->config.environment = sid2_envR; result->config.forceDualSids = false; result->config.frequency = 48000; result->config.leftVolume = 255; result->config.optimisation = SID2_DEFAULT_OPTIMISATION; - result->config.playback = sid2_stereo; + result->config.playback = sid2_mono; result->config.powerOnDelay = SID2_DEFAULT_POWER_ON_DELAY; result->config.precision = 16; result->config.rightVolume = 255; @@ -69,34 +62,29 @@ result->player.config(result->config); result->player.fastForward(100*32); - ReleaseMutex(hMutex); } - int __declspec(dllexport) DLL_FillBuffer(int sid, void* szBuffer, int length) + __declspec(dllexport) int DLL_FillBuffer(void* sid, void* szBuffer, int length) { - WaitForSingleObject(hMutex,INFINITE); SSid* player = (SSid*)sid; int iResult = player->player.play(szBuffer,length); - ReleaseMutex(hMutex); return iResult; } - void __declspec(dllexport) DLL_FreeSID(int sid) + __declspec(dllexport) void DLL_FreeSID(void* sid) { - WaitForSingleObject(hMutex,INFINITE); SSid* player = (SSid*)sid; delete player; - ReleaseMutex(hMutex); } - int __declspec(dllexport) DLL_GetNumberOfSongs(const char* szFileName) + __declspec(dllexport) int DLL_GetNumberOfSongs(const char* szFileName) { SidTune tune; tune.load(szFileName,true); return tune.getInfo().songs; } - void __declspec(dllexport) DLL_SetSpeed(int sid, int speed) + __declspec(dllexport) void DLL_SetSpeed(void* sid, int speed) { SSid* player = (SSid*)sid; player->player.fastForward(speed); diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/SIDCodec.cpp xbmc-10.00~svn34731/xbmc/cores/paplayer/SIDCodec.cpp --- xbmc-10.00~svn33778/xbmc/cores/paplayer/SIDCodec.cpp 2009-09-20 09:39:41.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/SIDCodec.cpp 2010-09-23 20:36:49.000000000 +0000 @@ -75,7 +75,7 @@ return false; } - m_Channels = 2; + m_Channels = 1; m_SampleRate = 48000; m_BitsPerSample = 16; CMusicInfoTagLoaderSid tagLoader; @@ -102,20 +102,20 @@ __int64 SIDCodec::Seek(__int64 iSeekTime) { - char temp[3840*4]; - if (m_iDataPos > iSeekTime/1000*48000*4) + char temp[3840*2]; + if (m_iDataPos > iSeekTime/1000*48000*2) { m_dll.StartPlayback(m_sid,m_iTrack); m_iDataPos = 0; } - while (m_iDataPos < iSeekTime/1000*48000*4) + while (m_iDataPos < iSeekTime/1000*48000*2) { - __int64 iRead = iSeekTime/1000*48000*4-m_iDataPos; - if (iRead > 3840*4) + __int64 iRead = iSeekTime/1000*48000*2-m_iDataPos; + if (iRead > 3840*2) { m_dll.SetSpeed(m_sid,32*100); - iRead = 3840*4; + iRead = 3840*2; } else m_dll.SetSpeed(m_sid,100); @@ -123,7 +123,7 @@ iRead = m_dll.FillBuffer(m_sid,temp,int(iRead)); if (!iRead) break; // get out of here - if (iRead == 3840*4) + if (iRead == 3840*2) m_iDataPos += iRead*32; else m_iDataPos += iRead; } @@ -138,7 +138,7 @@ m_iDataPos = 0; } - if (m_iDataPos >= m_TotalTime/1000*48000*4) + if (m_iDataPos >= m_TotalTime/1000*48000*2) return READ_EOF; m_dll.SetSpeed(m_sid,100); diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/SIDCodec.h xbmc-10.00~svn34731/xbmc/cores/paplayer/SIDCodec.h --- xbmc-10.00~svn33778/xbmc/cores/paplayer/SIDCodec.h 2008-05-17 22:18:44.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/SIDCodec.h 2010-09-23 20:34:59.000000000 +0000 @@ -39,7 +39,7 @@ private: DllSidplay2 m_dll; - int m_sid; + void* m_sid; int m_iTrack; __int64 m_iDataPos; }; diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp xbmc-10.00~svn34731/xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp --- xbmc-10.00~svn33778/xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp 2010-05-25 04:00:22.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp 2010-10-04 17:46:47.000000000 +0000 @@ -31,7 +31,7 @@ extern "C" { - int __declspec(dllexport) DLL_LoadYM(const char* szFileName) + __declspec(dllexport) void* DLL_LoadYM(const char* szFileName) { YMMUSIC *pMusic = ymMusicCreate(); @@ -39,7 +39,7 @@ { ymMusicSetLoopMode(pMusic,YMFALSE); ymMusicPlay(pMusic); - return (intptr_t)pMusic; + return pMusic; } ymMusicDestroy(pMusic); @@ -47,13 +47,13 @@ return 0; } - void __declspec(dllexport) DLL_FreeYM(int ym) + void __declspec(dllexport) DLL_FreeYM(void* ym) { ymMusicStop((YMMUSIC*)ym); ymMusicDestroy((YMMUSIC*)ym); } - int __declspec(dllexport) DLL_FillBuffer(int ym, char* szBuffer, int iSize) + int __declspec(dllexport) DLL_FillBuffer(void* ym, char* szBuffer, int iSize) { if (ymMusicCompute((YMMUSIC*)ym,(ymsample*)szBuffer,iSize/2)) return iSize; @@ -61,7 +61,7 @@ return 0; } - unsigned long __declspec(dllexport) DLL_Seek(int ym, unsigned long timepos) + unsigned long __declspec(dllexport) DLL_Seek(void* ym, unsigned long timepos) { if (ymMusicIsSeekable((YMMUSIC*)ym)) { @@ -72,21 +72,21 @@ return 0; } - const char __declspec(dllexport) *DLL_GetTitle(int ym) + const char __declspec(dllexport) *DLL_GetTitle(void* ym) { ymMusicInfo_t info; ymMusicGetInfo((YMMUSIC*)ym,&info); return info.pSongName; } - const char __declspec(dllexport) *DLL_GetArtist(int ym) + const char __declspec(dllexport) *DLL_GetArtist(void* ym) { ymMusicInfo_t info; ymMusicGetInfo((YMMUSIC*)ym,&info); return info.pSongAuthor; } - unsigned long __declspec(dllexport) DLL_GetLength(int ym) + unsigned long __declspec(dllexport) DLL_GetLength(void* ym) { ymMusicInfo_t info; ymMusicGetInfo((YMMUSIC*)ym,&info); diff -Nru xbmc-10.00~svn33778/xbmc/cores/paplayer/YMCodec.h xbmc-10.00~svn34731/xbmc/cores/paplayer/YMCodec.h --- xbmc-10.00~svn33778/xbmc/cores/paplayer/YMCodec.h 2008-05-17 22:18:44.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/paplayer/YMCodec.h 2010-10-04 17:46:47.000000000 +0000 @@ -39,7 +39,7 @@ private: DllStSound m_dll; - int m_ym; + void* m_ym; __int64 m_iDataPos; }; diff -Nru xbmc-10.00~svn33778/xbmc/cores/VideoRenderers/OverlayRendererDX.cpp xbmc-10.00~svn34731/xbmc/cores/VideoRenderers/OverlayRendererDX.cpp --- xbmc-10.00~svn33778/xbmc/cores/VideoRenderers/OverlayRendererDX.cpp 2010-09-02 01:14:44.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/VideoRenderers/OverlayRendererDX.cpp 2010-09-24 01:05:11.000000000 +0000 @@ -125,6 +125,7 @@ m_width = (float)width; m_height = (float)height; + m_count = 0; if (res.fPixelRatio > 1.0) width = MathUtils::round_int(width * res.fPixelRatio); @@ -154,7 +155,7 @@ return; } - if (!m_vertex.Create(sizeof(VERTEX) * 6 * quads.count, g_Windowing.DefaultD3DUsage(), m_fvf, g_Windowing.DefaultD3DPool())) + if (!m_vertex.Create(sizeof(VERTEX) * 6 * quads.count, D3DUSAGE_WRITEONLY, m_fvf, g_Windowing.DefaultD3DPool())) { CLog::Log(LOGERROR, "%s - failed to create vertex buffer", __FUNCTION__); m_texture.Release(); @@ -166,7 +167,7 @@ if (!m_vertex.Lock(0, 0, (void**)&vt, 0)) { - CLog::Log(LOGERROR, "%s - failed to lock texture", __FUNCTION__); + CLog::Log(LOGERROR, "%s - failed to lock vertex buffer", __FUNCTION__); m_texture.Release(); return; } @@ -227,6 +228,9 @@ void COverlayQuadsDX::Render(SRenderState &state) { + if (m_count == 0) + return; + D3DXMATRIX orig; LPDIRECT3DDEVICE9 device = g_Windowing.Get3DDevice(); device->GetTransform(D3DTS_WORLD, &orig); diff -Nru xbmc-10.00~svn33778/xbmc/cores/VideoRenderers/RenderManager.cpp xbmc-10.00~svn34731/xbmc/cores/VideoRenderers/RenderManager.cpp --- xbmc-10.00~svn33778/xbmc/cores/VideoRenderers/RenderManager.cpp 2010-08-18 18:08:35.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/VideoRenderers/RenderManager.cpp 2010-10-10 16:38:44.000000000 +0000 @@ -505,9 +505,9 @@ void CXBMCRenderManager::UpdateResolution() { - CRetakeLock lock(m_sharedSection); if (m_bReconfigured) { + CRetakeLock lock(m_sharedSection); if (g_graphicsContext.IsFullScreenVideo() && g_graphicsContext.IsFullScreenRoot()) { RESOLUTION res = GetResolution(); diff -Nru xbmc-10.00~svn33778/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp xbmc-10.00~svn34731/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp --- xbmc-10.00~svn33778/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp 2010-08-09 16:22:54.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp 2010-10-04 12:10:34.000000000 +0000 @@ -325,27 +325,33 @@ m_black = 0.0f; m_contrast = 1.0f; + string shaderfile; + if (CONF_FLAGS_FORMAT_MASK(flags) == CONF_FLAGS_FORMAT_YUY2) { if(rect) - PixelShader()->LoadSource("yuv2rgb_basic_rect_YUY2.arb"); + shaderfile = "yuv2rgb_basic_rect_YUY2.arb"; else - PixelShader()->LoadSource("yuv2rgb_basic_2d_YUY2.arb"); + shaderfile = "yuv2rgb_basic_2d_YUY2.arb"; } - if (CONF_FLAGS_FORMAT_MASK(flags) == CONF_FLAGS_FORMAT_UYVY) + else if (CONF_FLAGS_FORMAT_MASK(flags) == CONF_FLAGS_FORMAT_UYVY) { if(rect) - PixelShader()->LoadSource("yuv2rgb_basic_rect_UYVY.arb"); + shaderfile = "yuv2rgb_basic_rect_UYVY.arb"; else - PixelShader()->LoadSource("yuv2rgb_basic_2d_UYVY.arb"); + shaderfile = "yuv2rgb_basic_2d_UYVY.arb"; } else { if(rect) - PixelShader()->LoadSource("yuv2rgb_basic_rect.arb"); + shaderfile = "yuv2rgb_basic_rect.arb"; else - PixelShader()->LoadSource("yuv2rgb_basic_2d.arb"); + shaderfile = "yuv2rgb_basic_2d.arb"; } + + CLog::Log(LOGDEBUG, "GL: YUV2RGBProgressiveShaderARB: loading %s", shaderfile.c_str()); + + PixelShader()->LoadSource(shaderfile); } void YUV2RGBProgressiveShaderARB::OnCompiledAndLinked() diff -Nru xbmc-10.00~svn33778/xbmc/cores/VideoRenderers/WinRenderer.cpp xbmc-10.00~svn34731/xbmc/cores/VideoRenderers/WinRenderer.cpp --- xbmc-10.00~svn33778/xbmc/cores/VideoRenderers/WinRenderer.cpp 2010-08-25 06:42:14.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/cores/VideoRenderers/WinRenderer.cpp 2010-09-25 19:31:22.000000000 +0000 @@ -784,7 +784,7 @@ IDirect3DDevice9 *pD3DDev = g_Windowing.Get3DDevice(); D3DSURFACE_DESC srcDesc; if (FAILED(hr = m_SWTarget.Get()->GetLevelDesc(0, &srcDesc))) - CLog::Log(LOGERROR, __FUNCTION__": GetLevelDesc failed. (0x%08X)", hr); + CLog::Log(LOGERROR, __FUNCTION__": GetLevelDesc failed. %s", CRenderSystemDX::GetErrorDescription(hr).c_str()); float srcWidth = (float)srcDesc.Width; float srcHeight = (float)srcDesc.Height; @@ -865,7 +865,7 @@ hr = pD3DDev->SetFVF(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1); if (FAILED(hr = pD3DDev->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, vertex, sizeof(VERTEX)))) - CLog::Log(LOGERROR, __FUNCTION__": DrawPrimitiveUP failed. (0x%08X)", hr); + CLog::Log(LOGERROR, __FUNCTION__": DrawPrimitiveUP failed. %s", CRenderSystemDX::GetErrorDescription(hr).c_str()); pD3DDev->SetTexture(0, NULL); @@ -940,6 +940,7 @@ { CSingleLock lock(g_graphicsContext); RECT rect; + HRESULT hr; rect.top = m_destRect.y1; rect.bottom = m_destRect.y2; rect.left = m_destRect.x1; @@ -950,9 +951,9 @@ return; IDirect3DSurface9* target; - if(FAILED(g_Windowing.Get3DDevice()->GetRenderTarget(0, &target))) + if(FAILED(hr = g_Windowing.Get3DDevice()->GetRenderTarget(0, &target))) { - CLog::Log(LOGERROR, "CWinRenderer::RenderSurface - failed to get render target"); + CLog::Log(LOGERROR, "CWinRenderer::RenderSurface - failed to get render target. %s", CRenderSystemDX::GetErrorDescription(hr).c_str()); return; } @@ -1166,9 +1167,9 @@ void YUVBuffer::Clear() { - memset(planes[PLANE_Y].rect.pBits, 0, planes[0].rect.Pitch * m_height); - memset(planes[PLANE_U].rect.pBits, 128, planes[1].rect.Pitch * m_height>>1); - memset(planes[PLANE_V].rect.pBits, 128, planes[2].rect.Pitch * m_height>>1); + memset(planes[PLANE_Y].rect.pBits, 0, planes[PLANE_Y].rect.Pitch * m_height); + memset(planes[PLANE_U].rect.pBits, 128, planes[PLANE_U].rect.Pitch * (m_height/2)); + memset(planes[PLANE_V].rect.pBits, 128, planes[PLANE_V].rect.Pitch * (m_height/2)); } //================================== diff -Nru xbmc-10.00~svn33778/xbmc/DetectDVDType.cpp xbmc-10.00~svn34731/xbmc/DetectDVDType.cpp --- xbmc-10.00~svn33778/xbmc/DetectDVDType.cpp 2010-08-28 08:39:58.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/DetectDVDType.cpp 2010-10-11 15:15:33.000000000 +0000 @@ -48,6 +48,7 @@ #include "GUIWindowManager.h" #include "FileSystem/File.h" #include "FileItem.h" +#include "Application.h" using namespace XFILE; using namespace MEDIA_DETECT; @@ -96,14 +97,21 @@ while (( !m_bStop )) { - UpdateDvdrom(); - m_bStartup = false; - Sleep(2000); - if ( m_bAutorun ) - { - Sleep(1500); // Media in drive, wait 1.5s more to be sure the device is ready for playback - m_evAutorun.Set(); - m_bAutorun = false; + if (g_application.IsPlayingVideo()) + { + Sleep(10000); + } + else + { + UpdateDvdrom(); + m_bStartup = false; + Sleep(2000); + if ( m_bAutorun ) + { + Sleep(1500); // Media in drive, wait 1.5s more to be sure the device is ready for playback + m_evAutorun.Set(); + m_bAutorun = false; + } } } } diff -Nru xbmc-10.00~svn33778/xbmc/DllLibapetag.h xbmc-10.00~svn34731/xbmc/DllLibapetag.h --- xbmc-10.00~svn33778/xbmc/DllLibapetag.h 2010-02-28 12:29:18.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/DllLibapetag.h 2010-09-29 20:06:17.000000000 +0000 @@ -25,6 +25,7 @@ #include "utils/log.h" extern "C" { #undef strcasecmp +#include "lib/libapetag/file_io.h" #include "lib/libapetag/apetaglib.h" } @@ -33,7 +34,7 @@ public: virtual ~DllLibApeTagInterface() {} virtual int apetag_read (apetag *mem_cnt, char *filename, int flag)=0; - virtual int apetag_read_fp (apetag *mem_cnt, FILE * fp, char *filename, int flag)=0; + virtual int apetag_read_fp (apetag *mem_cnt, ape_file * fp, char *filename, int flag)=0; virtual apetag *apetag_init (void)=0; virtual void apetag_free (apetag *mem_cnt)=0; virtual int apetag_save (char *filename, apetag *mem_cnt, int flag)=0; @@ -45,7 +46,7 @@ virtual char *apefrm_getstr (apetag *mem_cnt, char *name)=0; virtual void apefrm_remove_real (apetag *mem_cnt, char *name)=0; virtual void apefrm_remove (apetag *mem_cnt, char *name)=0; - virtual int readtag_id3v1_fp (apetag *mem_cnt, FILE * fp)=0; + virtual int readtag_id3v1_fp (apetag *mem_cnt, ape_file * fp)=0; virtual void libapetag_print_mem_cnt (apetag *mem_cnt)=0; }; @@ -55,7 +56,7 @@ virtual ~DllLibApeTag() {} virtual int apetag_read (apetag *mem_cnt, char *filename, int flag) { return ::apetag_read(mem_cnt, filename, flag); } - virtual int apetag_read_fp (apetag *mem_cnt, FILE * fp, char *filename, int flag) + virtual int apetag_read_fp (apetag *mem_cnt, ape_file * fp, char *filename, int flag) { return ::apetag_read_fp (mem_cnt, fp, filename, flag); } virtual apetag *apetag_init (void) { return ::apetag_init (); } @@ -78,7 +79,7 @@ { return ::apefrm_remove_real (mem_cnt, name); } virtual void apefrm_remove (apetag *mem_cnt, char *name) { return ::apefrm_remove (mem_cnt, name); } - virtual int readtag_id3v1_fp (apetag *mem_cnt, FILE * fp) + virtual int readtag_id3v1_fp (apetag *mem_cnt, ape_file * fp) { return ::readtag_id3v1_fp (mem_cnt, fp); } virtual void libapetag_print_mem_cnt (apetag *mem_cnt) { return ::libapetag_print_mem_cnt (mem_cnt); } diff -Nru xbmc-10.00~svn33778/xbmc/FileItem.cpp xbmc-10.00~svn34731/xbmc/FileItem.cpp --- xbmc-10.00~svn33778/xbmc/FileItem.cpp 2010-08-29 19:05:35.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileItem.cpp 2010-10-06 10:08:15.000000000 +0000 @@ -500,6 +500,7 @@ if (HasVideoInfoTag()) return false; if (HasPictureInfoTag()) return false; if (IsCDDA()) return true; + if (!m_bIsFolder && IsShoutCast()) return true; if (!m_bIsFolder && IsLastFM()) return true; CStdString extension; @@ -526,7 +527,7 @@ bool CFileItem::IsKaraoke() const { - if ( !IsAudio() || IsLastFM()) + if ( !IsAudio() || IsLastFM() || IsShoutCast()) return false; return CKaraokeLyricsFactory::HasLyrics( m_strPath ); @@ -554,6 +555,11 @@ return CUtil::GetExtension(m_strPath).Equals(".cue", false); } +bool CFileItem::IsShoutCast() const +{ + return CUtil::IsShoutCast(m_strPath); +} + bool CFileItem::IsLastFM() const { return CUtil::IsLastFM(m_strPath); @@ -578,7 +584,8 @@ IsType(".ogg") || IsType(".nsf") || IsType(".sid") || - IsType(".sap") + IsType(".sap") || + IsShoutCast() ); } @@ -1481,6 +1488,9 @@ case SORT_METHOD_COUNTRY: FillSortFields(SSortFileItem::ByCountry); break; + case SORT_METHOD_DATEADDED: + FillSortFields(SSortFileItem::ByDateAdded); + break; case SORT_METHOD_FILE: FillSortFields(SSortFileItem::ByFile); break; @@ -1967,9 +1977,17 @@ #ifdef HAVE_LIBBLURAY if (dvdPath.IsEmpty()) { - CUtil::AddFileToFolder(item->m_strPath, "BDMV/index.bdmv", path); + CUtil::AddFileToFolder(item->m_strPath, "index.bdmv", path); if (CFile::Exists(path)) dvdPath = path; + else + { + CUtil::AddFileToFolder(item->m_strPath, "BDMV", dvdPath); + CUtil::AddFileToFolder(dvdPath, "index.bdmv", path); + dvdPath.Empty(); + if (CFile::Exists(path)) + dvdPath = path; + } } #endif if (!dvdPath.IsEmpty()) diff -Nru xbmc-10.00~svn33778/xbmc/FileItem.h xbmc-10.00~svn34731/xbmc/FileItem.h --- xbmc-10.00~svn33778/xbmc/FileItem.h 2010-08-10 15:02:23.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileItem.h 2010-09-29 12:08:17.000000000 +0000 @@ -89,6 +89,7 @@ bool IsAudio() const; bool IsKaraoke() const; bool IsCUESheet() const; + bool IsShoutCast() const; bool IsLastFM() const; bool IsInternetStream() const; bool IsPlayList() const; diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/AddonsDirectory.cpp xbmc-10.00~svn34731/xbmc/FileSystem/AddonsDirectory.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/AddonsDirectory.cpp 2010-08-31 04:28:41.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/AddonsDirectory.cpp 2010-10-11 23:13:16.000000000 +0000 @@ -29,6 +29,7 @@ #include "addons/Repository.h" #include "addons/PluginSource.h" #include "StringUtils.h" +#include "File.h" using namespace ADDON; @@ -53,14 +54,23 @@ VECADDONS addons; // get info from repository - if (path.GetHostName().Equals("enabled") || path.GetHostName().Equals("disabled")) + bool reposAsFolders = true; + if (path.GetHostName().Equals("enabled")) { - CAddonMgr::Get().GetAllAddons(addons, path.GetHostName().Equals("enabled")); + CAddonMgr::Get().GetAllAddons(addons, true); items.SetProperty("reponame",g_localizeStrings.Get(24062)); } + else if (path.GetHostName().Equals("disabled")) + { // grab all disabled addons, including disabled repositories + reposAsFolders = false; + CAddonMgr::Get().GetAllAddons(addons, false, true); + items.SetProperty("reponame",g_localizeStrings.Get(24039)); + } else if (path.GetHostName().Equals("outdated")) { + reposAsFolders = false; CAddonMgr::Get().GetAllOutdatedAddons(addons); + items.SetProperty("reponame",g_localizeStrings.Get(24043)); } else if (path.GetHostName().Equals("repos")) { @@ -130,7 +140,7 @@ } items.m_strPath = strPath; - GenerateListing(path, addons, items); + GenerateListing(path, addons, items, reposAsFolders); // check for available updates if (path.GetHostName().Equals("enabled")) { @@ -157,14 +167,17 @@ return true; } -void CAddonsDirectory::GenerateListing(CURL &path, VECADDONS& addons, CFileItemList &items) +void CAddonsDirectory::GenerateListing(CURL &path, VECADDONS& addons, CFileItemList &items, bool reposAsFolders) { items.ClearItems(); for (unsigned i=0; i < addons.size(); i++) { AddonPtr addon = addons[i]; - CFileItemPtr pItem = (addon->Type() == ADDON_REPOSITORY) ? FileItemFromAddon(addon, "addons://", true) - : FileItemFromAddon(addon, path.Get(), false); + CFileItemPtr pItem; + if (reposAsFolders && addon->Type() == ADDON_REPOSITORY) + pItem = FileItemFromAddon(addon, "addons://", true); + else + pItem = FileItemFromAddon(addon, path.Get(), false); AddonPtr addon2; if (CAddonMgr::Get().GetAddon(addon->ID(),addon2)) pItem->SetProperty("Addon.Status",g_localizeStrings.Get(305)); @@ -194,10 +207,17 @@ CFileItemPtr item(new CFileItem(path, folder)); item->SetLabel(addon->Name()); - item->SetLabel2(addon->Summary()); + if (!(basePath.Equals("addons://") && addon->Type() == ADDON_REPOSITORY)) + item->SetLabel2(addon->Version().str); item->SetThumbnailImage(addon->Icon()); + item->SetLabelPreformated(true); item->SetIconImage("DefaultAddon.png"); - item->SetProperty("fanart_image", addon->FanArt()); + if (!addon->FanArt().IsEmpty() && + (CUtil::IsInternetStream(addon->FanArt()) || + CFile::Exists(addon->FanArt()))) + { + item->SetProperty("fanart_image", addon->FanArt()); + } CAddonDatabase::SetPropertiesFromAddon(addon, item); return item; } diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/AddonsDirectory.h xbmc-10.00~svn34731/xbmc/FileSystem/AddonsDirectory.h --- xbmc-10.00~svn33778/xbmc/FileSystem/AddonsDirectory.h 2010-06-20 02:20:59.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/AddonsDirectory.h 2010-09-17 06:48:36.000000000 +0000 @@ -49,7 +49,7 @@ \return true if more than one item is found, false otherwise. */ static bool GetScriptsAndPlugins(const CStdString &content, CFileItemList &items); - static void GenerateListing(CURL &path, ADDON::VECADDONS& addons, CFileItemList &items); + static void GenerateListing(CURL &path, ADDON::VECADDONS& addons, CFileItemList &items, bool reposAsFolders = true); static CFileItemPtr FileItemFromAddon(ADDON::AddonPtr &addon, const CStdString &basePath, bool folder = false); }; } diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/CacheMemBuffer.cpp xbmc-10.00~svn34731/xbmc/FileSystem/CacheMemBuffer.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/CacheMemBuffer.cpp 2010-08-31 18:36:17.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/CacheMemBuffer.cpp 2010-10-10 13:01:06.000000000 +0000 @@ -88,7 +88,7 @@ nToWrite = 0; } - m_written.PulseEvent(); + m_written.Set(); return nToWrite; } @@ -128,7 +128,7 @@ } if (nRead > 0) - m_space.PulseEvent(); + m_space.Set(); return nRead; } @@ -181,7 +181,7 @@ } m_nStartPosition = iFilePosition; - m_space.PulseEvent(); + m_space.Set(); return m_nStartPosition; } @@ -210,7 +210,7 @@ m_HistoryBuffer.Clear(); m_nStartPosition = iFilePosition; - m_space.PulseEvent(); + m_space.Set(); return m_nStartPosition; } diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/CacheStrategy.cpp xbmc-10.00~svn34731/xbmc/FileSystem/CacheStrategy.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/CacheStrategy.cpp 2010-02-16 17:06:46.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/CacheStrategy.cpp 2010-10-10 13:01:06.000000000 +0000 @@ -175,7 +175,7 @@ m_nReadPosition += iRead; if (iRead > 0) - m_space.PulseEvent(); + m_space.Set(); return iRead; } @@ -238,7 +238,7 @@ return CACHE_RC_ERROR; m_nReadPosition = iTarget; - m_space.PulseEvent(); + m_space.Set(); return pos.QuadPart; } diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/Directory.cpp xbmc-10.00~svn34731/xbmc/FileSystem/Directory.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/Directory.cpp 2010-09-13 07:36:38.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/Directory.cpp 2010-10-10 19:51:21.000000000 +0000 @@ -120,7 +120,7 @@ CDirectory::~CDirectory() {} -bool CDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items, CStdString strMask /*=""*/, bool bUseFileDirectories /* = true */, bool allowPrompting /* = false */, DIR_CACHE_TYPE cacheDirectory /* = DIR_CACHE_ONCE */, bool extFileInfo /* = true */, bool allowThreads /* = false */) +bool CDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items, CStdString strMask /*=""*/, bool bUseFileDirectories /* = true */, bool allowPrompting /* = false */, DIR_CACHE_TYPE cacheDirectory /* = DIR_CACHE_ONCE */, bool extFileInfo /* = true */, bool allowThreads /* = false */, bool getHidden /* = false */) { try { @@ -208,8 +208,10 @@ for (int i = 0; i < items.Size(); ++i) { CFileItemPtr item = items[i]; + // TODO: we shouldn't be checking the gui setting here; + // callers should use getHidden instead if ((!item->m_bIsFolder && !pDirectory->IsAllowed(item->m_strPath)) || - (item->GetPropertyBOOL("file:hidden") && !g_guiSettings.GetBool("filelists.showhidden"))) + (item->GetPropertyBOOL("file:hidden") && !getHidden && !g_guiSettings.GetBool("filelists.showhidden"))) { items.Remove(i); i--; // don't confuse loop diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/Directory.h xbmc-10.00~svn34731/xbmc/FileSystem/Directory.h --- xbmc-10.00~svn33778/xbmc/FileSystem/Directory.h 2010-06-10 05:02:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/Directory.h 2010-10-10 19:51:21.000000000 +0000 @@ -41,7 +41,8 @@ , bool allowPrompting=false , DIR_CACHE_TYPE cacheDirectory=DIR_CACHE_ONCE , bool extFileInfo=true - , bool allowThreads=false); + , bool allowThreads=false + , bool getHidden=false); static bool Create(const CStdString& strPath); static bool Exists(const CStdString& strPath); diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/FileCurl.cpp xbmc-10.00~svn34731/xbmc/FileSystem/FileCurl.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/FileCurl.cpp 2010-08-17 20:18:49.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/FileCurl.cpp 2010-10-10 13:48:01.000000000 +0000 @@ -108,6 +108,13 @@ size_t CFileCurl::CReadState::HeaderCallback(void *ptr, size_t size, size_t nmemb) { + // clear any previous header + if(m_headerdone) + { + m_httpheader.Clear(); + m_headerdone = false; + } + // libcurl doc says that this info is not always \0 terminated char* strData = (char*)ptr; int iSize = size * nmemb; @@ -120,6 +127,9 @@ } else strData = strdup((char*)ptr); + if(strcmp(strData, "\r\n") == 0) + m_headerdone = true; + m_httpheader.Parse(strData); free(strData); @@ -187,6 +197,7 @@ m_bufferSize = 0; m_cancelled = false; m_bFirstLoop = true; + m_headerdone = false; } CFileCurl::CReadState::~CReadState() @@ -245,6 +256,7 @@ m_bufferSize = size; m_buffer.Destroy(); m_buffer.Create(size * 3); + m_headerdone = false; // read some data in to try and obtain the length // maybe there's a better way to get this info?? @@ -423,7 +435,10 @@ if (!m_referer.IsEmpty()) g_curlInterface.easy_setopt(h, CURLOPT_REFERER, m_referer.c_str()); else + { + g_curlInterface.easy_setopt(h, CURLOPT_REFERER, ""); g_curlInterface.easy_setopt(h, CURLOPT_AUTOREFERER, TRUE); + } // setup any requested authentication if( m_ftpauth.length() > 0 ) @@ -871,6 +886,11 @@ m_seekable = false; } } + + char* efurl; + if (CURLE_OK == g_curlInterface.easy_getinfo(m_state->m_easyHandle, CURLINFO_EFFECTIVE_URL,&efurl) && efurl) + m_url = efurl; + return true; } @@ -1062,6 +1082,14 @@ CURLcode result = g_curlInterface.easy_perform(m_state->m_easyHandle); + + if(result == CURLE_HTTP_RETURNED_ERROR) + { + long code; + if(g_curlInterface.easy_getinfo(m_state->m_easyHandle, CURLINFO_RESPONSE_CODE, &code) == CURLE_OK && code == 404 ) + return -1; + } + if(result == CURLE_GOT_NOTHING || result == CURLE_HTTP_RETURNED_ERROR || result == CURLE_RECV_ERROR /* some silly shoutcast servers */ ) diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/FileCurl.h xbmc-10.00~svn34731/xbmc/FileSystem/FileCurl.h --- xbmc-10.00~svn33778/xbmc/FileSystem/FileCurl.h 2010-05-26 21:36:36.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/FileCurl.h 2010-09-24 19:13:49.000000000 +0000 @@ -104,6 +104,7 @@ /* returned http header */ CHttpHeader m_httpheader; + bool m_headerdone; size_t WriteCallback(char *buffer, size_t size, size_t nitems); size_t HeaderCallback(void *ptr, size_t size, size_t nmemb); diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/FileSFTP.cpp xbmc-10.00~svn34731/xbmc/FileSystem/FileSFTP.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/FileSFTP.cpp 2010-08-07 13:17:39.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/FileSFTP.cpp 2010-10-08 19:24:18.000000000 +0000 @@ -551,7 +551,7 @@ int64_t CFileSFTP::GetLength() { struct __stat64 buffer; - if (Stat(&buffer) < 0) + if (Stat(&buffer) != 0) return 0; else { diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/HDDirectory.cpp xbmc-10.00~svn34731/xbmc/FileSystem/HDDirectory.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/HDDirectory.cpp 2010-05-06 16:57:56.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/HDDirectory.cpp 2010-09-22 14:54:03.000000000 +0000 @@ -191,6 +191,8 @@ bool CHDDirectory::Exists(const char* strPath) { + if (!strPath || !*strPath) + return false; CStdString strReplaced=strPath; #ifndef _LINUX CStdStringW strWReplaced; diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/HTSPDirectory.cpp xbmc-10.00~svn34731/xbmc/FileSystem/HTSPDirectory.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/HTSPDirectory.cpp 2010-03-11 21:07:49.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/HTSPDirectory.cpp 2010-10-12 18:21:31.000000000 +0000 @@ -401,6 +401,8 @@ else items.AddSortMethod(SORT_METHOD_LABEL, 20364, LABEL_MASKS("%Z", "%B", "%L", "")); + items.SetContent("livetv"); + return !channels.empty(); } diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/IDirectory.cpp xbmc-10.00~svn34731/xbmc/FileSystem/IDirectory.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/IDirectory.cpp 2010-09-13 07:36:38.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/IDirectory.cpp 2010-09-17 06:49:48.000000000 +0000 @@ -207,7 +207,7 @@ { if (var.isString()) return var.asString(); - else if (var.isInteger()) + else if (var.isInteger() && var.asInteger()) return g_localizeStrings.Get(var.asInteger()); return ""; } diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/iso9660.cpp xbmc-10.00~svn34731/xbmc/FileSystem/iso9660.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/iso9660.cpp 2010-05-27 02:03:04.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/iso9660.cpp 2010-10-03 13:30:23.000000000 +0000 @@ -965,6 +965,10 @@ // end += pos pContext->m_dwFilePos = pContext->m_dwFileSize + lOffset; break; + case SEEK_POSSIBLE: + return 1; + default: + return -1; } if (pContext->m_dwFilePos > pContext->m_dwFileSize || pContext->m_dwFilePos < 0) diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/iso9660.h xbmc-10.00~svn34731/xbmc/FileSystem/iso9660.h --- xbmc-10.00~svn33778/xbmc/FileSystem/iso9660.h 2010-05-18 03:30:07.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/iso9660.h 2010-10-03 13:30:23.000000000 +0000 @@ -24,6 +24,7 @@ #include #include #include "utils/IoSupport.h" +#include "IFile.h" #include "system.h" // for win32 types #ifdef _WIN32 diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/MythDirectory.cpp xbmc-10.00~svn34731/xbmc/FileSystem/MythDirectory.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/MythDirectory.cpp 2010-06-20 06:36:52.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/MythDirectory.cpp 2010-10-04 08:48:32.000000000 +0000 @@ -286,7 +286,7 @@ url.SetFileName("movies/" + path); break; case TV_SHOWS: - if (filter != name) + if (filter.CompareNoCase(name)) { m_dll->ref_release(program); continue; @@ -507,6 +507,16 @@ if (fileName == "") { + /* + * If we can't get the control then we can't connect to the backend. Don't even show any of the + * virtual folders as none of them will work. Without this check the "Browse" functionality + * when adding a myth:// source is way confusing as it shows folders so it looks like it has + * connected successfully when it in fact hasn't. + */ + cmyth_conn_t control = m_session->GetControl(); + if (!control) + return false; + CFileItemPtr item; item.reset(new CFileItem(base + "/recordings/", true)); diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/RarManager.cpp xbmc-10.00~svn34731/xbmc/FileSystem/RarManager.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/RarManager.cpp 2010-02-01 01:58:58.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/RarManager.cpp 2010-09-29 11:57:26.000000000 +0000 @@ -144,7 +144,17 @@ strPath.Replace('/', '\\'); #endif //g_charsetConverter.unknownToUTF8(strPath); - + CStdString strCachedPath; + CUtil::AddFileToFolder(strDir + "rarfolder%04d", CUtil::GetFileName(strPathInRar), strCachedPath); + strCachedPath = CUtil::GetNextPathname(strCachedPath, 9999); + if (strCachedPath.IsEmpty()) + { + CLog::Log(LOGWARNING, "Could not cache file %s", (strRarPath + strPathInRar).c_str()); + return false; + } + strCachedPath = CUtil::MakeLegalPath(strCachedPath); + CStdString strCachedDir; + CUtil::GetDirectory(strCachedPath, strCachedDir); int64_t iOffset = -1; if (iRes != 2) { @@ -177,8 +187,10 @@ if (iSize > 1024*1024 || iSize == -2) // 1MB bShowProgress=true; - CStdString strDir2(strDir); + CStdString strDir2(strCachedDir); CUtil::RemoveSlashAtEnd(strDir2); + if (!CDirectory::Exists(strDir2)) + CDirectory::Create(strDir2); iRes = urarlib_get(const_cast(strRarPath.c_str()), const_cast(strDir2.c_str()), const_cast(strPath.c_str()),NULL,&iOffset,bShowProgress); } @@ -207,8 +219,7 @@ pFile = &(j->second.second[j->second.second.size()-1]); pFile->m_iUsed = 1; } - CUtil::AddFileToFolder(strDir,CUtil::GetFileName(strPathInRar),pFile->m_strCachedPath); // GetFileName - pFile->m_strCachedPath = CUtil::MakeLegalPath(pFile->m_strCachedPath); + pFile->m_strCachedPath = strCachedPath; pFile->m_bAutoDel = (bOptions & EXFILE_AUTODELETE) != 0; pFile->m_iOffset = iOffset; strPathInCache = pFile->m_strCachedPath; diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/SpecialProtocolDirectory.cpp xbmc-10.00~svn34731/xbmc/FileSystem/SpecialProtocolDirectory.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/SpecialProtocolDirectory.cpp 2010-02-07 13:42:48.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/SpecialProtocolDirectory.cpp 2010-10-11 20:18:07.000000000 +0000 @@ -39,7 +39,7 @@ { CStdString untranslatedPath = strPath; // Why do I need a copy??? - the GetDirectory() call below will override strPath??? CStdString translatedPath = CSpecialProtocol::TranslatePath(strPath); - if (CDirectory::GetDirectory(translatedPath, items, m_strFileMask, m_useFileDirectories, m_allowPrompting, m_cacheDirectory, m_extFileInfo, false)) + if (CDirectory::GetDirectory(translatedPath, items, m_strFileMask, m_useFileDirectories, m_allowPrompting, m_cacheDirectory, m_extFileInfo, false, true)) { // replace our paths as necessary items.m_strPath = untranslatedPath; for (int i = 0; i < items.Size(); i++) diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/UPnPDirectory.cpp xbmc-10.00~svn34731/xbmc/FileSystem/UPnPDirectory.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/UPnPDirectory.cpp 2010-09-04 14:27:16.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/UPnPDirectory.cpp 2010-10-03 01:13:51.000000000 +0000 @@ -310,6 +310,28 @@ //CPictureInfoTag* tag = pItem->GetPictureInfoTag(); } } + + // look for subtitles + unsigned subs = 0; + for(unsigned r = 0; r < (*entry)->m_Resources.GetItemCount(); r++) + { + PLT_MediaItemResource& res = (*entry)->m_Resources[r]; + PLT_ProtocolInfo& info = res.m_ProtocolInfo; + static const char* allowed[] = { "text/srt" + , "text/ssa" + , "text/sub" + , "text/idx" }; + for(unsigned type = 0; type < sizeof(allowed)/sizeof(allowed[0]); type++) + { + if(info.Match(PLT_ProtocolInfo("*", "*", allowed[type], "*"))) + { + CStdString prop; + prop.Format("upnp:subtitle:%d", ++subs); + pItem->SetProperty(prop, (const char*)res.m_Uri); + break; + } + } + } } // if there is a thumbnail available set it here diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp xbmc-10.00~svn34731/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp 2010-05-07 09:41:49.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp 2010-09-26 22:50:37.000000000 +0000 @@ -322,7 +322,6 @@ pItem->m_bIsFolder = true; pItem->SetSpecialSort(g_advancedSettings.m_bVideoLibraryAllItemsOnBottom ? SORT_ON_BOTTOM : SORT_ON_TOP); pItem->SetCanQueue(false); - pItem->SetLabelPreformated(true); items.Add(pItem); } } diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/VirtualDirectory.cpp xbmc-10.00~svn34731/xbmc/FileSystem/VirtualDirectory.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/VirtualDirectory.cpp 2010-08-28 08:40:37.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/VirtualDirectory.cpp 2010-09-29 12:08:17.000000000 +0000 @@ -94,7 +94,7 @@ { CMediaSource& share = shares[i]; CFileItemPtr pItem(new CFileItem(share)); - if (pItem->IsLastFM() || (pItem->m_strPath.Left(14).Equals("musicsearch://"))) + if (pItem->IsLastFM() || pItem->IsShoutCast() || (pItem->m_strPath.Left(14).Equals("musicsearch://"))) pItem->SetCanQueue(false); CStdString strPathUpper = pItem->m_strPath; strPathUpper.ToUpper(); @@ -112,6 +112,7 @@ else if (pItem->m_strPath.Left(9) == "addons://") strIcon = "DefaultHardDisk.png"; else if (pItem->IsLastFM() + || pItem->IsShoutCast() || pItem->IsVideoDb() || pItem->IsMusicDb() || pItem->IsPlugin() diff -Nru xbmc-10.00~svn33778/xbmc/FileSystem/ZipManager.cpp xbmc-10.00~svn34731/xbmc/FileSystem/ZipManager.cpp --- xbmc-10.00~svn33778/xbmc/FileSystem/ZipManager.cpp 2010-05-15 04:10:09.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/FileSystem/ZipManager.cpp 2010-10-08 19:24:18.000000000 +0000 @@ -53,20 +53,22 @@ CLog::Log(LOGDEBUG, "%s - Processing %s", __FUNCTION__, strPath.c_str()); CURL url(strPath); - struct __stat64 m_StatData; + struct __stat64 m_StatData = {}; CStdString strFile = url.GetHostName(); + if (CFile::Stat(strFile,&m_StatData)) + { + CLog::Log(LOGDEBUG,"CZipManager::GetZipList: failed to stat file %s", strPath.c_str()); + return false; + } + map >::iterator it = mZipMap.find(strFile); if (it != mZipMap.end()) // already listed, just return it if not changed, else release and reread { map::iterator it2=mZipDate.find(strFile); - if (CFile::Stat(strFile,&m_StatData)) -#ifndef _LINUX - CLog::Log(LOGDEBUG,"statdata: %i, new: %i",it2->second,m_StatData.st_mtime); -#else - CLog::Log(LOGDEBUG,"statdata: %"PRIu64" new: %lu",it2->second,m_StatData.st_mtime); -#endif + CLog::Log(LOGDEBUG,"statdata: %"PRId64" new: %"PRIu64, it2->second, (uint64_t)m_StatData.st_mtime); + if (m_StatData.st_mtime == it2->second) { items = it->second; @@ -77,9 +79,9 @@ } CFile mFile; - if (!mFile.Open(_P(strFile))) + if (!mFile.Open(strFile)) { - CLog::Log(LOGDEBUG,"ZipManager: unable to open file %s!",_P(strFile).c_str()); + CLog::Log(LOGDEBUG,"ZipManager: unable to open file %s!",strFile.c_str()); return false; } @@ -93,7 +95,6 @@ return false; } // push date for update detection - CFile::Stat(strFile,&m_StatData); mZipDate.insert(make_pair(strFile,m_StatData.st_mtime)); diff -Nru xbmc-10.00~svn33778/xbmc/GUIDialogAddonSettings.cpp xbmc-10.00~svn34731/xbmc/GUIDialogAddonSettings.cpp --- xbmc-10.00~svn33778/xbmc/GUIDialogAddonSettings.cpp 2010-08-28 11:08:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIDialogAddonSettings.cpp 2010-09-17 10:41:44.000000000 +0000 @@ -928,9 +928,9 @@ { if (value) m_settings[id] = value; - else if (0 == strcmpi(type, "bool")) + else if (type && 0 == strcmpi(type, "bool")) m_settings[id] = "false"; - else if (0 == strcmpi(type, "slider") || 0 == strcmpi(type, "enum")) + else if (type && (0 == strcmpi(type, "slider") || 0 == strcmpi(type, "enum"))) m_settings[id] = "0"; else m_settings[id] = ""; diff -Nru xbmc-10.00~svn33778/xbmc/GUIDialogAudioSubtitleSettings.cpp xbmc-10.00~svn34731/xbmc/GUIDialogAudioSubtitleSettings.cpp --- xbmc-10.00~svn33778/xbmc/GUIDialogAudioSubtitleSettings.cpp 2010-09-06 19:05:12.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIDialogAudioSubtitleSettings.cpp 2010-09-19 16:59:13.000000000 +0000 @@ -393,6 +393,8 @@ db.EraseVideoSettings(); db.Close(); g_settings.m_defaultVideoSettings = g_settings.m_currentVideoSettings; + g_settings.m_defaultVideoSettings.m_SubtitleStream = -1; + g_settings.m_defaultVideoSettings.m_AudioStream = -1; g_settings.Save(); } } diff -Nru xbmc-10.00~svn33778/xbmc/GUIDialogVideoSettings.cpp xbmc-10.00~svn34731/xbmc/GUIDialogVideoSettings.cpp --- xbmc-10.00~svn33778/xbmc/GUIDialogVideoSettings.cpp 2010-07-19 06:44:38.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIDialogVideoSettings.cpp 2010-09-19 16:59:13.000000000 +0000 @@ -204,6 +204,8 @@ db.EraseVideoSettings(); db.Close(); g_settings.m_defaultVideoSettings = g_settings.m_currentVideoSettings; + g_settings.m_defaultVideoSettings.m_SubtitleStream = -1; + g_settings.m_defaultVideoSettings.m_AudioStream = -1; g_settings.Save(); } } diff -Nru xbmc-10.00~svn33778/xbmc/GUILargeTextureManager.cpp xbmc-10.00~svn34731/xbmc/GUILargeTextureManager.cpp --- xbmc-10.00~svn33778/xbmc/GUILargeTextureManager.cpp 2010-08-04 08:30:51.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUILargeTextureManager.cpp 2010-10-08 02:41:58.000000000 +0000 @@ -57,6 +57,8 @@ // cache the image if necessary loadPath = CTextureCache::Get().CheckAndCacheImage(loadPath); + if (loadPath.IsEmpty()) + return false; m_texture = new CTexture(); DWORD start = CTimeUtils::GetTimeMS(); diff -Nru xbmc-10.00~svn33778/xbmc/GUIPassword.cpp xbmc-10.00~svn34731/xbmc/GUIPassword.cpp --- xbmc-10.00~svn33778/xbmc/GUIPassword.cpp 2010-06-22 09:41:32.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIPassword.cpp 2010-09-30 10:09:44.000000000 +0000 @@ -191,10 +191,10 @@ bool CGUIPassword::IsProfileLockUnlocked(int iProfile) { bool bDummy; - return IsProfileLockUnlocked(iProfile,bDummy); + return IsProfileLockUnlocked(iProfile,bDummy,true); } -bool CGUIPassword::IsProfileLockUnlocked(int iProfile, bool& bCanceled) +bool CGUIPassword::IsProfileLockUnlocked(int iProfile, bool& bCanceled, bool prompt) { if (g_passwordManager.bMasterUser) return true; @@ -202,12 +202,16 @@ if (iProfile == -1) iProfileToCheck = g_settings.GetCurrentProfileIndex(); if (iProfileToCheck == 0) - return IsMasterLockUnlocked(true,bCanceled); + return IsMasterLockUnlocked(prompt,bCanceled); else { CProfile *profile = g_settings.GetProfile(iProfileToCheck); if (!profile) return false; + + if (!prompt) + return (profile->getLockMode() == LOCK_MODE_EVERYONE); + if (profile->getDate().IsEmpty() && (g_settings.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE || profile->getLockMode() == LOCK_MODE_EVERYONE)) diff -Nru xbmc-10.00~svn33778/xbmc/GUIPassword.h xbmc-10.00~svn34731/xbmc/GUIPassword.h --- xbmc-10.00~svn33778/xbmc/GUIPassword.h 2009-10-13 21:50:06.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIPassword.h 2010-09-30 10:09:44.000000000 +0000 @@ -52,7 +52,7 @@ bool CheckLock(LockType btnType, const CStdString& strPassword, int iHeading); bool CheckLock(LockType btnType, const CStdString& strPassword, int iHeading, bool& bCanceled); bool IsProfileLockUnlocked(int iProfile=-1); - bool IsProfileLockUnlocked(int iProfile, bool& bCanceled); + bool IsProfileLockUnlocked(int iProfile, bool& bCanceled, bool prompt = true); bool IsMasterLockUnlocked(bool bPromptUser); bool IsMasterLockUnlocked(bool bPromptUser, bool& bCanceled); diff -Nru xbmc-10.00~svn33778/xbmc/GUIViewStateVideo.cpp xbmc-10.00~svn34731/xbmc/GUIViewStateVideo.cpp --- xbmc-10.00~svn33778/xbmc/GUIViewStateVideo.cpp 2010-08-15 21:19:00.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIViewStateVideo.cpp 2010-10-06 10:08:15.000000000 +0000 @@ -263,6 +263,7 @@ AddSortMethod(SORT_METHOD_YEAR,562, LABEL_MASKS("%T", "%Y")); } AddSortMethod(SORT_METHOD_VIDEO_RUNTIME,2050, LABEL_MASKS("%T", "%D")); + AddSortMethod(SORT_METHOD_DATEADDED, 570, LABEL_MASKS("%T", "%R")); SetSortMethod(g_settings.m_viewStateVideoNavTitles.m_sortMethod); diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowAddonBrowser.cpp xbmc-10.00~svn34731/xbmc/GUIWindowAddonBrowser.cpp --- xbmc-10.00~svn33778/xbmc/GUIWindowAddonBrowser.cpp 2010-08-29 06:30:45.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowAddonBrowser.cpp 2010-10-10 20:14:32.000000000 +0000 @@ -43,6 +43,7 @@ #include "utils/log.h" #include "utils/SingleLock.h" #include "Settings.h" +#include "StringUtils.h" #include "Application.h" #include "AddonDatabase.h" #include "AdvancedSettings.h" @@ -54,6 +55,16 @@ using namespace XFILE; using namespace std; + +struct find_map : public binary_function +{ + bool operator() (CGUIWindowAddonBrowser::JobMap::value_type t, unsigned int id) const + { + return (t.second.jobID == id); + } +}; + + CGUIWindowAddonBrowser::CGUIWindowAddonBrowser(void) : CGUIMediaWindow(WINDOW_ADDON_BROWSER, "AddonBrowser.xml") { @@ -138,15 +149,17 @@ buttons.Add(CONTEXT_BUTTON_SCAN,24034); AddonPtr addon; - if (!CAddonMgr::Get().GetAddon(pItem->GetProperty("Addon.ID"), addon)) + if (!CAddonMgr::Get().GetAddon(pItem->GetProperty("Addon.ID"), addon, ADDON_UNKNOWN, false)) // allow disabled addons return; - if (addon->Type() == ADDON_REPOSITORY) + if (addon->Type() == ADDON_REPOSITORY && pItem->m_bIsFolder) { buttons.Add(CONTEXT_BUTTON_SCAN,24034); buttons.Add(CONTEXT_BUTTON_UPDATE_LIBRARY,24035); } + buttons.Add(CONTEXT_BUTTON_INFO,24003); + if (addon->HasSettings()) buttons.Add(CONTEXT_BUTTON_SETTINGS,24020); } @@ -164,7 +177,7 @@ } } AddonPtr addon; - if (!CAddonMgr::Get().GetAddon(pItem->GetProperty("Addon.ID"), addon)) + if (!CAddonMgr::Get().GetAddon(pItem->GetProperty("Addon.ID"), addon, ADDON_UNKNOWN, false)) // allow disabled addons return false; if (button == CONTEXT_BUTTON_SETTINGS) @@ -185,6 +198,12 @@ return true; } + if (button == CONTEXT_BUTTON_INFO) + { + CGUIDialogAddonInfo::ShowForItem(pItem); + return true; + } + return CGUIMediaWindow::OnContextButton(itemNumber, button); } @@ -232,13 +251,66 @@ return CGUIMediaWindow::OnClick(iItem); } +void CGUIWindowAddonBrowser::ReportInstallError(const CStdString& addonID, + const CStdString& fileName) +{ + AddonPtr addon; + CAddonDatabase database; + database.Open(); + database.GetAddon(addonID, addon); + if (addon) + { + AddonPtr addon2; + CAddonMgr::Get().GetAddon(addonID, addon2); + g_application.m_guiDialogKaiToast.QueueNotification( + addon->Icon(), + addon->Name(), + g_localizeStrings.Get(addon2 ? 113 : 114), + TOAST_DISPLAY_TIME, false); + } + else + { + g_application.m_guiDialogKaiToast.QueueNotification( + CGUIDialogKaiToast::Error, + fileName, + g_localizeStrings.Get(114), + TOAST_DISPLAY_TIME, false); + } +} + +void CGUIWindowAddonBrowser::ReportInstallErrorZip(const CStdString& zipName) +{ + CStdStringArray arr; + // FIXME: this doesn't work if addon id contains dashes + StringUtils::SplitString(zipName, "-", arr); + ReportInstallError(arr[0], zipName); +} + +bool CGUIWindowAddonBrowser::CheckHash(const CStdString& zipFile, + const CStdString& hash) +{ + if (hash.IsEmpty()) + return true; + CStdString package = CUtil::AddFileToFolder("special://home/addons/packages/", zipFile); + CStdString md5 = CUtil::GetFileMD5(package); + if (!md5.Equals(hash)) + { + CFile::Delete(package); + ReportInstallErrorZip(zipFile); + CLog::Log(LOGERROR,"MD5 mismatch after download %s", zipFile.c_str()); + return false; + } + + return true; +} + void CGUIWindowAddonBrowser::OnJobComplete(unsigned int jobID, bool success, CJob* job2) { if (success) { CFileOperationJob* job = (CFileOperationJob*)job2; - if (job->GetAction() == CFileOperationJob::ActionCopy) + if (job->GetAction() == CFileOperationJob::ActionReplace) { for (int i=0;iGetItems().Size();++i) { @@ -246,34 +318,18 @@ // zip is downloaded - now extract it if (CUtil::IsZIP(strFolder)) { + CSingleLock lock(m_critSection); + JobMap::iterator i = find_if(m_downloadJobs.begin(), m_downloadJobs.end(), bind2nd(find_map(), jobID)); + if (i != m_downloadJobs.end() && !CheckHash(CUtil::GetFileName(strFolder), i->second.hash)) + break; AddJob(strFolder); } else { - CURL url(strFolder); // zip extraction job is done - if (url.GetProtocol() == "zip") - { - CFileItemList list; - CDirectory::GetDirectory(url.Get(),list); - CStdString dirname = ""; - for (int i=0;im_bIsFolder) - { - dirname = list[i]->GetLabel(); - break; - } - } - strFolder = CUtil::AddFileToFolder("special://home/addons/", - dirname); - } - else - { - CUtil::RemoveSlashAtEnd(strFolder); - strFolder = CUtil::AddFileToFolder("special://home/addons/", - CUtil::GetFileName(strFolder)); - } + CUtil::RemoveSlashAtEnd(strFolder); + strFolder = CUtil::AddFileToFolder("special://home/addons/", + CUtil::GetFileName(strFolder)); AddonPtr addon; bool update=false; if (CAddonMgr::Get().LoadAddonDescription(strFolder, addon)) @@ -291,12 +347,7 @@ if (it->first.Equals("xbmc.metadata")) continue; if (!CAddonMgr::Get().GetAddon(it->first,addon2)) - { - CAddonDatabase database; - database.Open(); - if (database.GetAddon(it->first,addon2)) - AddJob(addon2->Path()); - } + InstallAddon(it->first); } if (addon->Type() >= ADDON_VIZ_LIBRARY) continue; @@ -317,6 +368,16 @@ TOAST_DISPLAY_TIME,false); } } + else + { + CStdString addonID = CUtil::GetFileName(strFolder); + ReportInstallError(addonID, addonID); + CLog::Log(LOGERROR,"Could not read addon description of %s", addonID.c_str()); + CFileItemList list; + list.Add(CFileItemPtr(new CFileItem(strFolder, true))); + list[0]->Select(true); + CJobManager::GetInstance().AddJob(new CFileOperationJob(CFileOperationJob::ActionDelete, list, ""), this); + } } } } @@ -336,7 +397,6 @@ unsigned int CGUIWindowAddonBrowser::AddJob(const CStdString& path) { - CGUIWindowAddonBrowser* that = (CGUIWindowAddonBrowser*)g_windowManager.GetWindow(WINDOW_ADDON_BROWSER); CFileItemList list; CStdString dest="special://home/addons/packages/"; CStdString package = CUtil::AddFileToFolder("special://home/addons/packages/", @@ -353,7 +413,18 @@ { CStdString archive; CUtil::CreateArchivePath(archive,"zip",package,""); - list.Add(CFileItemPtr(new CFileItem(archive,true))); + + CFileItemList archivedFiles; + CDirectory::GetDirectory(archive, archivedFiles); + + if (archivedFiles.Size() != 1 || !archivedFiles[0]->m_bIsFolder) + { + CFile::Delete(package); + ReportInstallErrorZip(CUtil::GetFileName(path)); + CLog::Log(LOGERROR, "Package %s is not a valid addon", CUtil::GetFileName(path).c_str()); + return false; + } + list.Add(CFileItemPtr(new CFileItem(archivedFiles[0]->m_strPath,true))); dest = "special://home/addons/"; } else @@ -363,15 +434,17 @@ } list[0]->Select(true); - CFileOperationJob* job = new CFileOperationJob(CFileOperationJob::ActionCopy, + CFileOperationJob* job = new CFileOperationJob(CFileOperationJob::ActionReplace, list,dest); - return CJobManager::GetInstance().AddJob(job,that); + return CJobManager::GetInstance().AddJob(job,this); } -void CGUIWindowAddonBrowser::RegisterJob(const CStdString& id, unsigned int jobid) +void CGUIWindowAddonBrowser::RegisterJob(const CStdString& id, + unsigned int jobid, + const CStdString& hash) { CSingleLock lock(m_critSection); - m_downloadJobs.insert(make_pair(id,jobid)); + m_downloadJobs.insert(make_pair(id,CDownloadJob(jobid,hash))); CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE); g_windowManager.SendThreadMessage(msg); } @@ -379,14 +452,9 @@ void CGUIWindowAddonBrowser::UnRegisterJob(unsigned int jobID) { CSingleLock lock(m_critSection); - for (JobMap::iterator i = m_downloadJobs.begin(); i != m_downloadJobs.end(); ++i) - { - if (i->second.jobID == jobID) - { - m_downloadJobs.erase(i); - return; - } - } + JobMap::iterator i = find_if(m_downloadJobs.begin(), m_downloadJobs.end(), bind2nd(find_map(), jobID)); + if (i != m_downloadJobs.end()) + m_downloadJobs.erase(i); } bool CGUIWindowAddonBrowser::GetDirectory(const CStdString& strDirectory, @@ -408,8 +476,18 @@ CURL url(strDirectory); CAddonsDirectory::GenerateListing(url,addons,items); result = true; - items.SetProperty("Repo.Name",g_localizeStrings.Get(24067)); + items.SetProperty("reponame",g_localizeStrings.Get(24067)); items.m_strPath = strDirectory; + + if (m_guiState.get() && !m_guiState->HideParentDirItems()) + { + CFileItemPtr pItem(new CFileItem("..")); + pItem->m_strPath = m_history.GetParentPath(); + pItem->m_bIsFolder = true; + pItem->m_bIsShareOrDrive = false; + items.AddFront(pItem, 0); + } + } else result = CGUIMediaWindow::GetDirectory(strDirectory,items); @@ -523,11 +601,19 @@ database.Open(); if (database.GetAddon(addonID, addon)) { + CStdString repo; + database.GetRepoForAddon(addonID,repo); + AddonPtr ptr; + CAddonMgr::Get().GetAddon(repo,ptr); + RepositoryPtr therepo = boost::dynamic_pointer_cast(ptr); + CStdString hash; + if (therepo) + hash = therepo->GetAddonHash(addon); CGUIWindowAddonBrowser* window = (CGUIWindowAddonBrowser*)g_windowManager.GetWindow(WINDOW_ADDON_BROWSER); if (!window) return; unsigned int jobID = window->AddJob(addon->Path()); - window->RegisterJob(addon->ID(), jobID); + window->RegisterJob(addon->ID(), jobID, hash); } } @@ -562,15 +648,12 @@ { CSingleLock lock(m_critSection); // find this job - for (JobMap::iterator i = m_downloadJobs.begin(); i != m_downloadJobs.end(); ++i) + JobMap::iterator i = find_if(m_downloadJobs.begin(), m_downloadJobs.end(), bind2nd(find_map(), jobID)); + if (i != m_downloadJobs.end()) { - if (i->second.jobID == jobID) - { - i->second.progress = progress; - CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE_ITEM); - msg.SetStringParam(i->first); - g_windowManager.SendThreadMessage(msg); - return; - } + i->second.progress = progress; + CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE_ITEM); + msg.SetStringParam(i->first); + g_windowManager.SendThreadMessage(msg); } } diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowAddonBrowser.h xbmc-10.00~svn34731/xbmc/GUIWindowAddonBrowser.h --- xbmc-10.00~svn33778/xbmc/GUIWindowAddonBrowser.h 2010-07-13 08:11:32.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowAddonBrowser.h 2010-10-10 19:51:42.000000000 +0000 @@ -31,6 +31,20 @@ class CFileItemList; class CFileOperationJob; +class CDownloadJob +{ +public: + CDownloadJob(unsigned int id, const CStdString& thehash) + { + jobID = id; + progress = 0; + hash = thehash; + } + unsigned int jobID; + unsigned int progress; + CStdString hash; +}; + class CGUIWindowAddonBrowser : public CGUIMediaWindow, public IJobCallback @@ -44,7 +58,7 @@ void OnJobComplete(unsigned int jobID, bool success, CJob* job); void OnJobProgress(unsigned int jobID, unsigned int progress, unsigned int total, const CJob *job); - static unsigned int AddJob(const CStdString& path); + unsigned int AddJob(const CStdString& path); /*! \brief Popup a selection dialog with a list of addons of the given type \param type the type of addon wanted @@ -65,13 +79,34 @@ */ static void InstallAddonsFromXBMCRepo(const std::set &addonIDs); + typedef std::map JobMap; + JobMap m_downloadJobs; + protected: /* \brief set label2 of an item based on the Addon.Status property \param item the item to update */ void SetItemLabel2(CFileItemPtr item); - void RegisterJob(const CStdString& id, unsigned int jobid); + /*! \brief Queue a notification for addon installation/update failure + \param addonID - addon id + \param fileName - filename which is shown in case the addon id is unknown + */ + void ReportInstallError(const CStdString& addonID, const CStdString& fileName); + + /*! \brief Queue a notification for addon installation/update failure when only zip filename is known + \param zipName - zip filename (will try to guess addon ID from it) + */ + void ReportInstallErrorZip(const CStdString& zipName); + + /*! \brief Check the hash of a downloaded addon with the hash in the repository + \param addonZip - filename of the zipped addon to check + \param hash - correct hash of the file + \return true if the hash matches (or no hash is available on the repo), false otherwise + */ + bool CheckHash(const CStdString& addonZip, const CStdString& hash); + + void RegisterJob(const CStdString& id, unsigned int jobid, const CStdString& hash=""); void UnRegisterJob(unsigned int jobID); virtual void GetContextButtons(int itemNumber, CContextButtons &buttons); virtual bool OnContextButton(int itemNumber, CONTEXT_BUTTON button); @@ -81,19 +116,6 @@ virtual bool Update(const CStdString &strDirectory); virtual CStdString GetStartFolder(const CStdString &dir); private: - class CDownloadJob - { - public: - CDownloadJob(unsigned int id) - { - jobID = id; - progress = 0; - } - unsigned int jobID; - unsigned int progress; - }; - typedef std::map JobMap; - JobMap m_downloadJobs; CCriticalSection m_critSection; CPictureThumbLoader m_thumbLoader; }; diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowFullScreen.cpp xbmc-10.00~svn34731/xbmc/GUIWindowFullScreen.cpp --- xbmc-10.00~svn33778/xbmc/GUIWindowFullScreen.cpp 2010-09-02 23:16:09.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowFullScreen.cpp 2010-09-24 15:14:40.000000000 +0000 @@ -252,9 +252,13 @@ { g_settings.m_currentVideoSettings.m_SubtitleOn = !g_settings.m_currentVideoSettings.m_SubtitleOn; g_application.m_pPlayer->SetSubtitleVisible(g_settings.m_currentVideoSettings.m_SubtitleOn); - int label = g_settings.m_currentVideoSettings.m_SubtitleOn?305:1223; - g_application.m_guiDialogKaiToast.QueueNotification(CGUIDialogKaiToast::Info, g_localizeStrings.Get(287), - g_localizeStrings.Get(label), TOAST_DISPLAY_TIME, false); + CStdString sub; + if (g_settings.m_currentVideoSettings.m_SubtitleOn) + g_application.m_pPlayer->GetSubtitleName(g_settings.m_currentVideoSettings.m_SubtitleStream,sub); + else + sub = g_localizeStrings.Get(1223); + g_application.m_guiDialogKaiToast.QueueNotification(CGUIDialogKaiToast::Info, + g_localizeStrings.Get(287), sub, TOAST_DISPLAY_TIME, false); } return true; break; @@ -272,17 +276,32 @@ case ACTION_NEXT_SUBTITLE: { - if (g_application.m_pPlayer->GetSubtitleCount() <= 1) + if (g_application.m_pPlayer->GetSubtitleCount() == 0) return true; - g_settings.m_currentVideoSettings.m_SubtitleStream++; - if (g_settings.m_currentVideoSettings.m_SubtitleStream >= g_application.m_pPlayer->GetSubtitleCount()) - g_settings.m_currentVideoSettings.m_SubtitleStream = 0; - g_application.m_pPlayer->SetSubtitle(g_settings.m_currentVideoSettings.m_SubtitleStream); + if (g_settings.m_currentVideoSettings.m_SubtitleOn) + { + g_settings.m_currentVideoSettings.m_SubtitleStream++; + if (g_settings.m_currentVideoSettings.m_SubtitleStream >= g_application.m_pPlayer->GetSubtitleCount()) + { + g_settings.m_currentVideoSettings.m_SubtitleStream = 0; + g_settings.m_currentVideoSettings.m_SubtitleOn = false; + g_application.m_pPlayer->SetSubtitleVisible(false); + } + g_application.m_pPlayer->SetSubtitle(g_settings.m_currentVideoSettings.m_SubtitleStream); + } + else + { + g_settings.m_currentVideoSettings.m_SubtitleOn = true; + g_application.m_pPlayer->SetSubtitleVisible(true); + } + CStdString sub; - g_application.m_pPlayer->GetSubtitleName(g_settings.m_currentVideoSettings.m_SubtitleStream,sub); + if (g_settings.m_currentVideoSettings.m_SubtitleOn) + g_application.m_pPlayer->GetSubtitleName(g_settings.m_currentVideoSettings.m_SubtitleStream,sub); + else + sub = g_localizeStrings.Get(1223); g_application.m_guiDialogKaiToast.QueueNotification(CGUIDialogKaiToast::Info, g_localizeStrings.Get(287), sub, TOAST_DISPLAY_TIME, false); - return true; } return true; break; diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowLoginScreen.cpp xbmc-10.00~svn34731/xbmc/GUIWindowLoginScreen.cpp --- xbmc-10.00~svn33778/xbmc/GUIWindowLoginScreen.cpp 2010-07-29 20:43:07.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowLoginScreen.cpp 2010-10-06 10:08:48.000000000 +0000 @@ -30,6 +30,7 @@ #include "lib/libPython/XBPython.h" #endif #include "lib/libscrobbler/scrobbler.h" +#include "utils/Builtins.h" #include "utils/Weather.h" #include "utils/Network.h" #include "addons/Skin.h" @@ -131,10 +132,14 @@ bool CGUIWindowLoginScreen::OnAction(const CAction &action) { - // don't allow any built in actions to act here. + // don't allow built in actions to act here except shutdown related ones. // this forces only navigation type actions to be performed. if (action.GetID() == ACTION_BUILT_IN_FUNCTION) - return true; // pretend we handled it + { + if (action.GetName().Find("shutdown") != 1) + CBuiltins::Execute(action.GetName()); + return true; + } return CGUIWindow::OnAction(action); } diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowMusicBase.cpp xbmc-10.00~svn34731/xbmc/GUIWindowMusicBase.cpp --- xbmc-10.00~svn33778/xbmc/GUIWindowMusicBase.cpp 2010-08-21 10:04:13.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowMusicBase.cpp 2010-09-29 12:08:17.000000000 +0000 @@ -906,7 +906,7 @@ if (item->IsSmartPlayList() || m_vecItems->IsSmartPlayList()) buttons.Add(CONTEXT_BUTTON_EDIT_SMART_PLAYLIST, 586); - else if (item->IsPlayList() || m_vecItems->IsPlayList()) + else if ((item->IsPlayList() || m_vecItems->IsPlayList()) && !item->IsShoutCast()) buttons.Add(CONTEXT_BUTTON_EDIT, 586); } } diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowMusicNav.cpp xbmc-10.00~svn34731/xbmc/GUIWindowMusicNav.cpp --- xbmc-10.00~svn33778/xbmc/GUIWindowMusicNav.cpp 2010-08-29 06:30:45.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowMusicNav.cpp 2010-09-29 12:08:17.000000000 +0000 @@ -423,7 +423,7 @@ CMusicDatabaseDirectory dir; // enable music info button on an album or on a song. if (item->IsAudio() && !item->IsPlayList() && !item->IsSmartPlayList() && - !item->IsLastFM() && !item->m_bIsFolder) + !item->IsLastFM() && !item->IsShoutCast() && !item->m_bIsFolder) { buttons.Add(CONTEXT_BUTTON_SONG_INFO, 658); } @@ -442,7 +442,7 @@ else if (!inPlaylists && (dir.HasAlbumInfo(item->m_strPath)|| dir.IsArtistDir(item->m_strPath) ) && !dir.IsAllItem(item->m_strPath) && !item->IsParentFolder() && - !item->IsLastFM() && + !item->IsLastFM() && !item->IsShoutCast() && !item->m_strPath.Left(14).Equals("musicsearch://")) { if (dir.IsArtistDir(item->m_strPath)) @@ -454,7 +454,7 @@ // enable query all albums button only in album view if (dir.HasAlbumInfo(item->m_strPath) && !dir.IsAllItem(item->m_strPath) && item->m_bIsFolder && !item->IsVideoDb() && !item->IsParentFolder() && - !item->IsLastFM() && + !item->IsLastFM() && !item->IsShoutCast() && !item->IsPlugin() && !item->m_strPath.Left(14).Equals("musicsearch://")) { buttons.Add(CONTEXT_BUTTON_INFO_ALL, 20059); @@ -513,7 +513,7 @@ if (database.GetMatchingMusicVideo(item->GetMusicInfoTag()->GetArtist(),item->GetMusicInfoTag()->GetAlbum(),item->GetMusicInfoTag()->GetTitle()) > -1) buttons.Add(CONTEXT_BUTTON_PLAY_OTHER, 20401); } - if (item->HasVideoInfoTag() && !item->m_bIsFolder) + if (item->HasVideoInfoTag() && !item->m_bIsFolder && !item->IsShoutCast()) { if (item->GetVideoInfoTag()->m_playCount > 0) buttons.Add(CONTEXT_BUTTON_MARK_UNWATCHED, 16104); //Mark as UnWatched diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowMusicPlaylist.cpp xbmc-10.00~svn34731/xbmc/GUIWindowMusicPlaylist.cpp --- xbmc-10.00~svn33778/xbmc/GUIWindowMusicPlaylist.cpp 2010-08-21 10:04:13.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowMusicPlaylist.cpp 2010-09-29 12:08:17.000000000 +0000 @@ -527,7 +527,7 @@ } else { // aren't in a move - if (!item->IsLastFM()) + if (!item->IsLastFM() && !item->IsShoutCast()) buttons.Add(CONTEXT_BUTTON_SONG_INFO, 658); // Song Info if (CFavourites::IsFavourite(item.get(), GetID())) buttons.Add(CONTEXT_BUTTON_ADD_FAVOURITE, 14077); // Remove Favourite diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowMusicSongs.cpp xbmc-10.00~svn34731/xbmc/GUIWindowMusicSongs.cpp --- xbmc-10.00~svn33778/xbmc/GUIWindowMusicSongs.cpp 2010-08-29 06:30:45.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowMusicSongs.cpp 2010-09-29 12:08:17.000000000 +0000 @@ -255,7 +255,7 @@ } // Disable scan button if shoutcast - if (m_vecItems->IsVirtualDirectoryRoot() || + if (m_vecItems->IsVirtualDirectoryRoot() || m_vecItems->IsShoutCast() || m_vecItems->IsLastFM() || m_vecItems->IsMusicDb()) { CONTROL_DISABLE(CONTROL_BTNSCAN); @@ -316,9 +316,9 @@ return; if (!item->IsPlayList()) { - if (item->IsAudio() && !item->IsLastFM()) + if (item->IsAudio() && !item->IsLastFM() && !item->IsShoutCast()) buttons.Add(CONTEXT_BUTTON_SONG_INFO, 658); // Song Info - else if (!item->IsParentFolder() && !item->IsLastFM() && + else if (!item->IsParentFolder() && !item->IsLastFM() && !item->IsShoutCast() && !item->m_strPath.Left(3).Equals("new") && item->m_bIsFolder) { #if 0 @@ -364,7 +364,7 @@ if (pScanDlg->IsScanning()) buttons.Add(CONTEXT_BUTTON_STOP_SCANNING, 13353); // Stop Scanning else if (!inPlaylists && !m_vecItems->IsInternetStream() && - !item->IsLastFM() && + !item->IsLastFM() && !item->IsShoutCast() && !item->m_strPath.Equals("add") && !item->IsParentFolder() && !item->IsPlugin() && (g_settings.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser)) diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowPictures.cpp xbmc-10.00~svn34731/xbmc/GUIWindowPictures.cpp --- xbmc-10.00~svn33778/xbmc/GUIWindowPictures.cpp 2010-08-29 06:30:45.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowPictures.cpp 2010-10-09 15:13:51.000000000 +0000 @@ -516,7 +516,7 @@ void CGUIWindowPictures::OnInfo(int itemNumber) { CFileItemPtr item = (itemNumber >= 0 && itemNumber < m_vecItems->Size()) ? m_vecItems->Get(itemNumber) : CFileItemPtr(); - if (!item || item->m_bIsFolder || item->IsZIP() || item->IsRAR() || item->IsCBZ() || item->IsCBR()) + if (!item || item->m_bIsFolder || item->IsZIP() || item->IsRAR() || item->IsCBZ() || item->IsCBR() || !item->IsPicture()) return; CGUIDialogPictureInfo *pictureInfo = (CGUIDialogPictureInfo *)g_windowManager.GetWindow(WINDOW_DIALOG_PICTURE_INFO); if (pictureInfo) diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowSettingsCategory.cpp xbmc-10.00~svn34731/xbmc/GUIWindowSettingsCategory.cpp --- xbmc-10.00~svn33778/xbmc/GUIWindowSettingsCategory.cpp 2010-09-08 06:21:00.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowSettingsCategory.cpp 2010-09-30 15:29:24.000000000 +0000 @@ -485,9 +485,7 @@ } else if (strSetting.Equals("videoscreen.resolution")) { - FillInResolutions(strSetting, g_guiSettings.GetInt("videoscreen.screen"), false); - CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(GetSetting(strSetting)->GetID()); - pControl->SetValue(g_guiSettings.GetResolution()); + FillInResolutions(strSetting, g_guiSettings.GetInt("videoscreen.screen"), g_guiSettings.GetResolution(), false); } else if (strSetting.Equals("videoscreen.screenmode")) { @@ -1215,7 +1213,7 @@ } else if (strSetting.Equals("musiclibrary.import")) { - CStdString path(g_settings.GetDatabaseFolder()); + CStdString path; VECSOURCES shares; g_mediaManager.GetLocalDrives(shares); if (CGUIDialogFileBrowser::ShowAndGetFile(shares, "musicdb.xml", g_localizeStrings.Get(651) , path)) @@ -1423,7 +1421,7 @@ else if (strSetting.Equals("lookandfeel.font")) { // new font choosen... CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(pSettingControl->GetID()); - CStdString strSkinFontSet = pControl->GetCurrentLabel(); + CStdString strSkinFontSet = m_SkinFontSetIDs[pControl->GetCurrentLabel()]; if (strSkinFontSet != ".svn" && strSkinFontSet != g_guiSettings.GetString("lookandfeel.font")) { g_guiSettings.SetString("lookandfeel.font", strSkinFontSet); @@ -1451,7 +1449,7 @@ { DisplayMode mode = g_guiSettings.GetInt("videoscreen.screen"); // Cascade - FillInResolutions("videoscreen.resolution", mode, true); + FillInResolutions("videoscreen.resolution", mode, RES_DESKTOP, true); } else if (strSetting.Equals("videoscreen.resolution")) { @@ -2120,6 +2118,7 @@ pControl->Clear(); setting->SetDelayed(); + m_SkinFontSetIDs.clear(); int iSkinFontSet = 0; CStdString strPath = g_SkinInfo->GetSkinPath("Font.xml"); @@ -2150,6 +2149,7 @@ if (strValue == "fontset") { const char* idAttr = ((TiXmlElement*) pChild)->Attribute("id"); + const char* idLocAttr = ((TiXmlElement*) pChild)->Attribute("idloc"); const char* unicodeAttr = ((TiXmlElement*) pChild)->Attribute("unicode"); bool isUnicode=(unicodeAttr && stricmp(unicodeAttr, "true") == 0); @@ -2160,7 +2160,16 @@ if (idAttr != NULL && isAllowed) { - pControl->AddLabel(idAttr, iSkinFontSet); + if (idLocAttr) + { + pControl->AddLabel(g_localizeStrings.Get(atoi(idLocAttr)), iSkinFontSet); + m_SkinFontSetIDs[g_localizeStrings.Get(atoi(idLocAttr))] = idAttr; + } + else + { + pControl->AddLabel(idAttr, iSkinFontSet); + m_SkinFontSetIDs[idAttr] = idAttr; + } if (strcmpi(idAttr, g_guiSettings.GetString("lookandfeel.font").c_str()) == 0) pControl->SetValue(iSkinFontSet); iSkinFontSet++; @@ -2287,7 +2296,7 @@ return mode; } -void CGUIWindowSettingsCategory::FillInResolutions(CStdString strSetting, DisplayMode mode, bool UserChange) +void CGUIWindowSettingsCategory::FillInResolutions(CStdString strSetting, DisplayMode mode, RESOLUTION res, bool UserChange) { CBaseSettingControl *control = GetSetting(strSetting); control->SetDelayed(); @@ -2295,9 +2304,12 @@ pControl->Clear(); + RESOLUTION spinres = RES_INVALID; // index of the resolution in the spinner that has same screen/width/height as res + if (mode == DM_WINDOWED) { pControl->AddLabel(g_localizeStrings.Get(242), RES_WINDOW); + spinres = RES_WINDOW; } else { @@ -2308,6 +2320,11 @@ CStdString strRes; strRes.Format("%dx%d", resolutions[idx].width, resolutions[idx].height); pControl->AddLabel(strRes, resolutions[idx].ResInfo_Index); + + RESOLUTION_INFO res1 = g_settings.m_ResInfo[res]; + RESOLUTION_INFO res2 = g_settings.m_ResInfo[resolutions[idx].ResInfo_Index]; + if (res1.iScreen == res2.iScreen && res1.iWidth == res2.iWidth && res1.iHeight == res2.iHeight) + spinres = (RESOLUTION) resolutions[idx].ResInfo_Index; } } @@ -2335,7 +2352,8 @@ } else { - // selecting a value is done outside of this function when UserChange = false + // select the entry equivalent to the resolution passed by the res parameter + pControl->SetValue(spinres); } } @@ -2408,9 +2426,7 @@ g_graphicsContext.SetVideoResolution(lastRes); DisplayMode mode = FillInScreens("videoscreen.screen", lastRes); - FillInResolutions("videoscreen.resolution", mode, false); - CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(GetSetting("videoscreen.resolution")->GetID()); - pControl->SetValue(lastRes); + FillInResolutions("videoscreen.resolution", mode, lastRes, false); FillInRefreshRates("videoscreen.screenmode", lastRes, false); } } @@ -2797,13 +2813,13 @@ { m_DigitalAudioSinkMap.clear(); m_DigitalAudioSinkMap["Error - no devices found"] = "null:"; - m_DigitalAudioSinkMap["custom"] = "custom"; + m_DigitalAudioSinkMap[g_localizeStrings.Get(636)] = "custom"; } else { m_AnalogAudioSinkMap.clear(); m_AnalogAudioSinkMap["Error - no devices found"] = "null:"; - m_AnalogAudioSinkMap["custom"] = "custom"; + m_AnalogAudioSinkMap[g_localizeStrings.Get(636)] = "custom"; } int numberSinks = 0; @@ -2844,7 +2860,7 @@ if (currentDevice.Equals("custom")) selectedValue = numberSinks; - pControl->AddLabel("custom", numberSinks++); + pControl->AddLabel(g_localizeStrings.Get(636), numberSinks++); #endif if (selectedValue < 0) diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowSettingsCategory.h xbmc-10.00~svn34731/xbmc/GUIWindowSettingsCategory.h --- xbmc-10.00~svn33778/xbmc/GUIWindowSettingsCategory.h 2010-07-02 03:39:56.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowSettingsCategory.h 2010-09-30 15:25:09.000000000 +0000 @@ -49,7 +49,7 @@ void FillInSoundSkins(CSetting *pSetting); void FillInLanguages(CSetting *pSetting); DisplayMode FillInScreens(CStdString strSetting, RESOLUTION res); - void FillInResolutions(CStdString strSetting, DisplayMode mode, bool UserChange); + void FillInResolutions(CStdString strSetting, DisplayMode mode, RESOLUTION res, bool UserChange); void FillInRefreshRates(CStdString strSetting, RESOLUTION res, bool UserChange); void OnRefreshRateChanged(RESOLUTION resolution); void FillInRegions(CSetting *pSetting); @@ -105,6 +105,7 @@ std::map m_AnalogAudioSinkMap; std::map m_DigitalAudioSinkMap; + std::map m_SkinFontSetIDs; // state of the window saved in JumpToSection() // to get to the previous settings screen when diff -Nru xbmc-10.00~svn33778/xbmc/GUIWindowVideoBase.cpp xbmc-10.00~svn34731/xbmc/GUIWindowVideoBase.cpp --- xbmc-10.00~svn33778/xbmc/GUIWindowVideoBase.cpp 2010-08-28 11:09:36.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/GUIWindowVideoBase.cpp 2010-09-17 06:46:53.000000000 +0000 @@ -1022,10 +1022,19 @@ if (!item->m_bIsFolder) { CStdString resumeString = GetResumeString(*item); - return OnFileAction(iItem, !resumeString.IsEmpty() ? SELECT_ACTION_CHOOSE : SELECT_ACTION_PLAY); + if (!resumeString.IsEmpty()) + { + CContextButtons choices; + choices.Add(SELECT_ACTION_RESUME, resumeString); + choices.Add(SELECT_ACTION_PLAY, 12021); // Start from beginning + int value = CGUIDialogContextMenu::ShowAndGetChoice(choices); + if (value < 0) + return true; + return OnFileAction(iItem, value); + } } - - return true; + + return OnFileAction(iItem, SELECT_ACTION_PLAY); } void CGUIWindowVideoBase::OnStreamDetails(const CStreamDetails &details, const CStdString &strFileName, long lFileId) @@ -1327,8 +1336,7 @@ CFileItem item(*pItem); if (pItem->IsVideoDb()) { - item = CFileItem(*pItem->GetVideoInfoTag()); - item.m_lStartOffset = pItem->m_lStartOffset; + item.m_strPath = pItem->GetVideoInfoTag()->m_strFileNameAndPath; item.SetProperty("original_listitem_url", pItem->m_strPath); } diff -Nru xbmc-10.00~svn33778/xbmc/KeyboardStat.cpp xbmc-10.00~svn34731/xbmc/KeyboardStat.cpp --- xbmc-10.00~svn33778/xbmc/KeyboardStat.cpp 2010-05-17 22:38:47.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/KeyboardStat.cpp 2010-09-26 13:09:15.000000000 +0000 @@ -120,6 +120,7 @@ { { 121, 0xad } // Volume mute , { 122, 0xae } // Volume down , { 123, 0xaf } // Volume up +, { 127, 0x20 } // Pause , { 135, 0x5d } // Right click , { 136, 0xb2 } // Stop , { 138, 0x49 } // Info @@ -559,6 +560,8 @@ CLog::Log(LOGDEBUG, "CKeyboardStat::Initialize - XKb symbols %s", symbols); if(strstr(symbols, "(evdev)")) m_bEvdev = true; + else + m_bEvdev = false; } XFree(symbols); diff -Nru xbmc-10.00~svn33778/xbmc/lib/cmyth/libcmyth/cmyth_local.h xbmc-10.00~svn34731/xbmc/lib/cmyth/libcmyth/cmyth_local.h --- xbmc-10.00~svn33778/xbmc/lib/cmyth/libcmyth/cmyth_local.h 2010-03-01 20:32:08.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/cmyth/libcmyth/cmyth_local.h 2010-10-02 22:41:55.000000000 +0000 @@ -102,6 +102,8 @@ #define CMYTH_UTC_LEN (sizeof("1240120680") - 1) #define CMYTH_COMMBREAK_START 4 #define CMYTH_COMMBREAK_END 5 +#define CMYTH_CUTLIST_START 1 +#define CMYTH_CUTLIST_END 0 /** * MythTV backend connection diff -Nru xbmc-10.00~svn33778/xbmc/lib/cmyth/libcmyth/commbreak.c xbmc-10.00~svn34731/xbmc/lib/cmyth/libcmyth/commbreak.c --- xbmc-10.00~svn33778/xbmc/lib/cmyth/libcmyth/commbreak.c 2010-01-13 19:10:59.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/cmyth/libcmyth/commbreak.c 2010-10-02 22:41:55.000000000 +0000 @@ -144,9 +144,12 @@ int consumed; int total = 0; long rows; + long long mark; + long long start = -1; char *failed = NULL; cmyth_commbreak_t commbreak; unsigned short type; + unsigned short start_type; int i; int j; @@ -170,70 +173,61 @@ cmyth_dbg(CMYTH_DBG_DEBUG, "%s: no commercial breaks found.\n", __FUNCTION__); return 0; - } else { - /* - * Don't check for an uneven row count. mythcommflag can mark the start of the last - * commercial break, but then not mark the end before it reaches the end of the file. - * For this case the last commercial break is ignored. - */ - breaklist->commbreak_count = rows / 2; - } - - breaklist->commbreak_list = malloc(breaklist->commbreak_count * - sizeof(cmyth_commbreak_t)); - if (!breaklist->commbreak_list) { - cmyth_dbg(CMYTH_DBG_ERROR, "%s: malloc() failed for list\n", - __FUNCTION__); - *err = ENOMEM; - return consumed; } - memset(breaklist->commbreak_list, 0, breaklist->commbreak_count * sizeof(cmyth_commbreak_t)); - for (i = 0; i < breaklist->commbreak_count; i++) { - commbreak = cmyth_commbreak_create(); - - for (j = 0; j < 2; j++) { - consumed = cmyth_rcv_ushort(conn, err, &type, count); - count -= consumed; - total += consumed; - if (*err) { - failed = "cmyth_rcv_ushort"; - goto fail; - } - /* - * Do a little sanity-checking. - */ - if (j == 0 && type != CMYTH_COMMBREAK_START) { - cmyth_dbg(CMYTH_DBG_ERROR, - "%s: type was not CMYTH_COMMBREAK_START\n", - __FUNCTION__); - return 0; - } else if (j == 1 && type != CMYTH_COMMBREAK_END) { - cmyth_dbg(CMYTH_DBG_ERROR, - "%s: type was not CMYTH_COMMBREAK_END\n", - __FUNCTION__); - return 0; - } + for (i = 0; i < rows; i++) { + consumed = cmyth_rcv_ushort(conn, err, &type, count); + count -= consumed; + total += consumed; + if (*err) { + failed = "cmyth_rcv_ushort"; + goto fail; + } - /* - * Only marks are returned, not the offsets. Marks are encoded in long_long. - */ - if (j == 0) { - consumed = cmyth_rcv_long_long(conn, err, &commbreak->start_mark, count); + consumed = cmyth_rcv_long_long(conn, err, &mark, count); + count -= consumed; + total += consumed; + if (*err) { + failed = "cmyth_rcv_long long"; + goto fail; + } + if (type == CMYTH_COMMBREAK_START || type == CMYTH_CUTLIST_START) { + start = mark; + start_type = type; + } else if (type == CMYTH_COMMBREAK_END || type == CMYTH_CUTLIST_END) { + if (start >= 0 && + (type == CMYTH_COMMBREAK_END && start_type == CMYTH_COMMBREAK_START + || type == CMYTH_CUTLIST_END && start_type == CMYTH_CUTLIST_START)) + { + commbreak = cmyth_commbreak_create(); + commbreak->start_mark = start; + commbreak->end_mark = mark; + start = -1; + breaklist->commbreak_list = realloc(breaklist->commbreak_list, + (++breaklist->commbreak_count) * sizeof(cmyth_commbreak_t)); + breaklist->commbreak_list[breaklist->commbreak_count - 1] = commbreak; } else { - consumed = cmyth_rcv_long_long(conn, err, &commbreak->end_mark, count); - } - - count -= consumed; - total += consumed; - if (*err) { - failed = "cmyth_rcv_long"; - goto fail; + cmyth_dbg(CMYTH_DBG_WARN, + "%s: ignoring 'end' marker without a 'start' marker at %lld\n", + __FUNCTION__, type, mark); } - + } else { + cmyth_dbg(CMYTH_DBG_WARN, + "%s: type (%d) is not a COMMBREAK or CUTLIST\n", + __FUNCTION__, type); } - - breaklist->commbreak_list[i] = commbreak; + } + if (start >= 0) { + /* + * The last entry may be a start without and end mark. We need to make the end_mark really big + * (but not too big) + */ + commbreak = cmyth_commbreak_create(); + commbreak->start_mark = start; + commbreak->end_mark = 1 << 30; + breaklist->commbreak_list = realloc(breaklist->commbreak_list, + (++breaklist->commbreak_count) * sizeof(cmyth_commbreak_t)); + breaklist->commbreak_list[breaklist->commbreak_count - 1] = commbreak; } return total; diff -Nru xbmc-10.00~svn33778/xbmc/lib/cmyth/libcmyth/event.c xbmc-10.00~svn34731/xbmc/lib/cmyth/libcmyth/event.c --- xbmc-10.00~svn33778/xbmc/lib/cmyth/libcmyth/event.c 2009-12-06 21:24:11.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/cmyth/libcmyth/event.c 2010-10-02 22:17:37.000000000 +0000 @@ -101,7 +101,7 @@ count -= consumed; } } else { - cmyth_dbg(CMYTH_DBG_DETAIL, + cmyth_dbg(CMYTH_DBG_ERROR, "%s: unknown mythtv BACKEND_MESSAGE '%s'\n", __FUNCTION__, tmp); event = CMYTH_EVENT_UNKNOWN; } diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/apetaglib.c xbmc-10.00~svn34731/xbmc/lib/libapetag/apetaglib.c --- xbmc-10.00~svn33778/xbmc/lib/libapetag/apetaglib.c 2010-02-09 14:52:57.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/apetaglib.c 2010-09-29 20:05:43.000000000 +0000 @@ -32,6 +32,7 @@ #if !defined(__BORLANDC__) && !defined(_MSC_VER) # include #endif +#include "file_io.h" #include "apetaglib.h" #include "is_tag.h" @@ -617,15 +618,15 @@ \return 0 - OK else check #atl_return */ int -readtag_id3v1_fp (apetag *mem_cnt, FILE * fp) +readtag_id3v1_fp (apetag *mem_cnt, ape_file * fp) { struct _id3v1Tag m; if (!is_id3v1(fp)) return 0; /* TODO:: 0 or no_id3v1*/ - fseek(fp, -128, SEEK_END); - if (sizeof (struct _id3v1Tag)!=fread(&m, 1, sizeof (struct _id3v1Tag), fp)){ + ape_fseek(fp, -128, SEEK_END); + if (sizeof (struct _id3v1Tag)!=ape_fread(&m, 1, sizeof (struct _id3v1Tag), fp)){ PRINT_ERR( "ERROR->libapetag->readtag_id3v1_fp:fread\n"); return ATL_FREAD; } @@ -707,7 +708,7 @@ \return 0 - OK else check #atl_return */ int -apetag_read_fp(apetag *mem_cnt, FILE * fp, char *filename, int flag) +apetag_read_fp(apetag *mem_cnt, ape_file * fp, char *filename, int flag) { int id3v1 = 0; int apeTag2 = 0; @@ -719,20 +720,20 @@ unsigned long tagCount; unsigned char *p; - savedFilePosition = ftell(fp); + savedFilePosition = ape_ftell(fp); id3v1 = is_id3v1(fp); if (mem_cnt == NULL) { PRINT_ERR( ">apetaglib>READ_FP>FATAL>apetag_init()\n"); - fseek(fp, savedFilePosition, SEEK_SET); + ape_fseek(fp, savedFilePosition, SEEK_SET); return ATL_NOINIT; } - fseek(fp, id3v1 ? -128 - (ssize_t)sizeof (ape_footer) : -(ssize_t)sizeof (ape_footer), SEEK_END); - if (sizeof (ape_footer) != fread(&ape_footer, 1, sizeof (ape_footer), fp)){ + ape_fseek(fp, id3v1 ? -128 - (ssize_t)sizeof (ape_footer) : -(ssize_t)sizeof (ape_footer), SEEK_END); + if (sizeof (ape_footer) != ape_fread(&ape_footer, 1, sizeof (ape_footer), fp)){ PRINT_ERR( "ERROR->libapetag->apetag_read_fp:fread1\n"); - fseek(fp, savedFilePosition, SEEK_SET); + ape_fseek(fp, savedFilePosition, SEEK_SET); return ATL_FREAD; } @@ -754,12 +755,12 @@ return ATL_MALOC; } - fseek(fp, id3v1 ? -(long)ape2long(ape_footer.length) - + ape_fseek(fp, id3v1 ? -(long)ape2long(ape_footer.length) - 128 : -(long)ape2long(ape_footer.length), SEEK_END); memset(buff, 0, buffLength); - if (ape2long(ape_footer.length) != fread(buff, 1, ape2long(ape_footer.length), fp)) { + if (ape2long(ape_footer.length) != ape_fread(buff, 1, ape2long(ape_footer.length), fp)) { PRINT_ERR( "ERROR->libapetag->apetag_read_fp:fread2\n"); - fseek(fp, savedFilePosition, SEEK_SET); + ape_fseek(fp, savedFilePosition, SEEK_SET); free(buff); return ATL_FREAD; } @@ -805,7 +806,7 @@ readtag_id3v1_fp(mem_cnt, fp); } - fseek(fp, savedFilePosition, SEEK_SET); + ape_fseek(fp, savedFilePosition, SEEK_SET); return 0; } @@ -825,20 +826,20 @@ int apetag_read (apetag *mem_cnt, char *filename,int flag) { - FILE *fp; + ape_file *fp = NULL; if (mem_cnt==NULL) { PRINT_ERR(">apetaglib>READ>FATAL>apetag_init()\n"); return ATL_NOINIT; } - fp = fopen (filename, "rb"); + fp = ape_fopen (filename, "rb"); if (fp == NULL) return ATL_FOPEN; apetag_read_fp (mem_cnt, fp, filename,flag); - fclose (fp); + ape_fclose (fp); return 0; } @@ -922,7 +923,7 @@ int apetag_save (char *filename, apetag *mem_cnt, int flag) { - FILE *fp; + ape_file *fp; struct _id3v1Tag id3v1_tag; int id3v1; int apeTag, saveApe2; @@ -941,7 +942,7 @@ return ATL_NOINIT; } - fp = fopen (filename, "rb+"); + fp = ape_fopen (filename, "rb+"); if (fp == NULL) { PRINT_ERR ( "ERROR->apetaglib->apetag_save::fopen (r+)\n"); return ATL_FOPEN; @@ -953,8 +954,8 @@ saveApe2 = !(flag & APE_TAG_V1); // (flag & APE_TAG_V2) ? 1 : (flag & APE_TAG_V1); if (id3v1) { - fseek (fp, -128, SEEK_END); - fread (&id3v1_tag, 1, sizeof (struct _id3v1Tag), fp); + ape_fseek (fp, -128, SEEK_END); + ape_fread (&id3v1_tag, 1, sizeof (struct _id3v1Tag), fp); skipBytes += id3v1; } skipBytes += apeTag; @@ -1050,26 +1051,26 @@ size_t newFileSize; size_t writedBytes; - fseek (fp, 0, SEEK_END); - fileSize = ftell (fp); - fseek (fp, fileSize - skipBytes, SEEK_SET); + ape_fseek (fp, 0, SEEK_END); + fileSize = ape_ftell (fp); + ape_fseek (fp, fileSize - skipBytes, SEEK_SET); if (tagCount != 0) { newFileSize = (fileSize - skipBytes + tagSSize + (saveApe2 ? 32 : 0)); - writedBytes = fwrite (buff, 1, tagSSize + (saveApe2 ? 32 : 0), fp); + writedBytes = ape_fwrite (buff, 1, tagSSize + (saveApe2 ? 32 : 0), fp); if (writedBytes != tagSSize + (saveApe2 ? 32 : 0)) { PRINT_ERR ("FATAL_ERROR->libapetag->apetag_save::fwrite [data lost]"); - fclose (fp); + ape_fclose (fp); free (buff); return ATL_FWRITE; } - fseek (fp, newFileSize, SEEK_SET); + ape_fseek (fp, newFileSize, SEEK_SET); PRINT_D4 (">apetaglib>SAVE>> write:%i == tag:%i file: %i->%i\n", writedBytes, tagSSize + (saveApe2 ? 32 : 0), fileSize, newFileSize); } else { newFileSize = (fileSize - skipBytes); } - fflush (fp); - fclose (fp); + ape_fflush (fp); + ape_fclose (fp); /* ftruncate don't work */ truncate (filename, newFileSize); } else { /* !!SAVE_FAKE_SAVE */ diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/apetaglib.h xbmc-10.00~svn34731/xbmc/lib/libapetag/apetaglib.h --- xbmc-10.00~svn33778/xbmc/lib/libapetag/apetaglib.h 2010-01-22 07:22:36.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/apetaglib.h 2010-09-29 20:05:43.000000000 +0000 @@ -194,7 +194,7 @@ /* read file and add frames */ int -apetag_read_fp (apetag *mem_cnt, FILE * fp, char *filename, int flag) ; +apetag_read_fp (apetag *mem_cnt, ape_file * fp, char *filename, int flag) ; /* initialise new object #apetag and return */ apetag * @@ -248,7 +248,7 @@ /* read id3v1 and add frames */ int -readtag_id3v1_fp (apetag *mem_cnt, FILE * fp) ; +readtag_id3v1_fp (apetag *mem_cnt, ape_file * fp) ; /** \name flags in frames and headers */ /**\{*/ diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/file_io.c xbmc-10.00~svn34731/xbmc/lib/libapetag/file_io.c --- xbmc-10.00~svn33778/xbmc/lib/libapetag/file_io.c 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/file_io.c 2010-09-29 20:05:43.000000000 +0000 @@ -0,0 +1,137 @@ +/******************************************************************** +* +* Copyright (c) 2010 Team XBMC. All rights reserved. +* +********************************************************************/ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#if !defined(__BORLANDC__) && !defined(_MSC_VER) +# include +#endif +#include "file_io.h" + +#ifdef _MSC_VER +#pragma warning(disable: 4996) +#define strcasecmp stricmp +#define snprintf _snprintf +#define USE_CHSIZE +#define S_IRUSR 0 +#define S_IWUSR 0 +#define S_IRGRP 0 +#define S_IWGRP 0 +#if defined(_WIN64) + typedef __int64 ssize_t; +#else + typedef long ssize_t; +#endif +#endif + +/* LOCAL STRUCTURES */ + +/** + \struct _ape_ape_file + \brief structure for file I/O + */ +struct _ape_file_io +{ + size_t (*read_func) (void *ptr, size_t size, size_t nmemb, void *datasource); + int (*seek_func) (void *datasource, long int offset, int whence); + long (*tell_func) (void *datasource); + void *data; +}; + +/* LOCAL FUNCTIONS */ + +static size_t fread_internal(void *ptr, size_t size, size_t nmemb, void *fp) +{ + return fread(ptr, size, nmemb, (FILE *)fp); +} + +static int fseek_internal(void *fp, long int offset, int whence) +{ + return fseek((FILE *)fp, offset, whence); +} + +static long ftell_internal(void *fp) +{ + return ftell((FILE *)fp); +} + +ape_file *ape_fopen(const char *file, const char *rw) +{ + FILE *data = NULL; + ape_file *fp = NULL; + + data = fopen(file, rw); + if (data) + { + fp = malloc(sizeof(ape_file)); + if (fp) + { + fp->read_func = fread_internal; + fp->seek_func = fseek_internal; + fp->tell_func = ftell_internal; + fp->data = data; + } + else + { + fclose(data); + } + } + return fp; +} + +int ape_fclose(ape_file *fp) +{ + int ret = fclose((FILE *)fp->data); + free(fp); + return ret; +} + +int ape_fflush(ape_file *fp) +{ + return fflush((FILE *)fp->data); +} + +size_t ape_fwrite(const void * ptr, size_t size, size_t count, ape_file *fp) +{ + return fwrite(ptr, size, count, (FILE *)fp->data); +} + +size_t ape_fread(void *ptr, size_t size, size_t nmemb, ape_file *fp) +{ + return fp->read_func(ptr, size, nmemb, fp->data); +} + +int ape_fseek(ape_file *fp, long int offset, int whence) +{ + return fp->seek_func(fp->data, offset, whence); +} + +long ape_ftell(ape_file *fp) +{ + return fp->tell_func(fp->data); +} diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/file_io.h xbmc-10.00~svn34731/xbmc/lib/libapetag/file_io.h --- xbmc-10.00~svn33778/xbmc/lib/libapetag/file_io.h 1970-01-01 00:00:00.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/file_io.h 2010-09-29 20:05:43.000000000 +0000 @@ -0,0 +1,46 @@ +/******************************************************************** +* +* Copyright (c) 2010 Team XBMC. All rights reserved. +* +********************************************************************/ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef _FILEIO_H +#define _FILEIO_H + +/** \file + \brief All function related to apetag file i/o +*/ + + +/** + object ape_file used to store file i/o functions + contains functions read_func,seek_func,tell_func,close_func and a data pointer. + \brief object ape_file used to store file i/o functions + */ +typedef struct _ape_file_io ape_file; + +ape_file *ape_fopen(const char *file, const char *rw); +size_t ape_fread(void *ptr, size_t size, size_t nmemb, ape_file *fp); +int ape_fseek(ape_file *fp, long int offset, int whence); +int ape_fclose(ape_file *fp); +long ape_ftell(ape_file *fp); +int ape_fflush(ape_file *fp); +size_t ape_fwrite (const void * ptr, size_t size, size_t count, ape_file *fp); + +#endif /* _FILEIO_H */ diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/info_mac.c xbmc-10.00~svn34731/xbmc/lib/libapetag/info_mac.c --- xbmc-10.00~svn33778/xbmc/lib/libapetag/info_mac.c 2010-01-23 22:25:59.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/info_mac.c 2010-09-29 20:05:43.000000000 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include "file_io.h" #include "info_mac.h" #include "is_tag.h" @@ -95,23 +96,23 @@ info_mac_read(const char *fn, StreamInfoMac * Info) { unsigned int HeaderData[32]; - FILE *tmpFile = NULL; + ape_file *tmpFile = NULL; long SkipSizeID3; struct macHeader * header; // load file - tmpFile = fopen(fn, "rb"); + tmpFile = ape_fopen(fn, "rb"); if (tmpFile == NULL) return 1; // file not found or read-protected // skip id3v2 SkipSizeID3 = is_id3v2(tmpFile); - fseek(tmpFile, SkipSizeID3, SEEK_SET); - fread((void *) HeaderData, sizeof (int), 16, tmpFile); - fseek(tmpFile, 0, SEEK_END); - Info->FileSize = ftell(tmpFile); - fclose(tmpFile); + ape_fseek(tmpFile, SkipSizeID3, SEEK_SET); + ape_fread((void *) HeaderData, sizeof (int), 16, tmpFile); + ape_fseek(tmpFile, 0, SEEK_END); + Info->FileSize = ape_ftell(tmpFile); + ape_fclose(tmpFile); if (0 != memcmp(HeaderData, "MAC", 3)) return 2; // no monkeyAudio file diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/info_mpc.c xbmc-10.00~svn34731/xbmc/lib/libapetag/info_mpc.c --- xbmc-10.00~svn33778/xbmc/lib/libapetag/info_mpc.c 2010-01-23 22:25:59.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/info_mpc.c 2010-09-29 20:05:43.000000000 +0000 @@ -31,6 +31,7 @@ #include #include #include +#include "file_io.h" #include "info_mpc.h" #include "is_tag.h" @@ -61,7 +62,7 @@ } int -read_file_header_fp(FILE *fp, StreamInfoMpc * Info) +read_file_header_fp(ape_file *fp, StreamInfoMpc * Info) { return 0; @@ -76,24 +77,24 @@ info_mpc_read(const char *fn, StreamInfoMpc * Info) { unsigned int HeaderData[16]; - FILE *tmpFile = NULL; + ape_file *tmpFile = NULL; long SkipSizeID3; // load file - tmpFile = fopen(fn, "rb"); + tmpFile = ape_fopen(fn, "rb"); if (tmpFile == NULL) return 1; // file not found or read-protected // skip id3v2 SkipSizeID3=is_id3v2(tmpFile); - fseek(tmpFile,SkipSizeID3 , SEEK_SET); - fread((void *) HeaderData, sizeof (int), 16, tmpFile); - fseek(tmpFile, 0, SEEK_END); - Info->FileSize=ftell(tmpFile); + ape_fseek(tmpFile,SkipSizeID3 , SEEK_SET); + ape_fread((void *) HeaderData, sizeof (int), 16, tmpFile); + ape_fseek(tmpFile, 0, SEEK_END); + Info->FileSize=ape_ftell(tmpFile); // stream size Info->ByteLength = Info->FileSize-is_id3v1(tmpFile)-is_ape(tmpFile)-SkipSizeID3; - fclose(tmpFile); + ape_fclose(tmpFile); if (0 != memcmp(HeaderData, "MP+", 3)) return 2; // no musepack file diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/is_tag.c xbmc-10.00~svn34731/xbmc/lib/libapetag/is_tag.c --- xbmc-10.00~svn33778/xbmc/lib/libapetag/is_tag.c 2010-01-22 07:22:36.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/is_tag.c 2010-09-29 20:05:43.000000000 +0000 @@ -28,6 +28,7 @@ #include #include #include +#include "file_io.h" #include "is_tag.h" unsigned long @@ -46,24 +47,24 @@ \return Return size of id3v1 tag (in bytes) 0 no tag at all */ int -is_id3v1 (FILE * fp) +is_id3v1 (ape_file * fp) { int n=0; char buf[16]; size_t savedFilePosition; - savedFilePosition = ftell (fp); - fseek (fp, 0, SEEK_END); + savedFilePosition = ape_ftell(fp); + ape_fseek (fp, 0, SEEK_END); do { n++; memset (buf, 0, sizeof (buf)); - fseek (fp, ((-128)*n) - 3 , SEEK_END); - fread (&buf, 1, sizeof (buf), fp); + ape_fseek (fp, ((-128)*n) - 3 , SEEK_END); + ape_fread (&buf, 1, sizeof (buf), fp); if (memcmp (buf, "APETAGEX",8) == 0) /*APE.TAG.EX*/ break; } while (memcmp (buf+3, "TAG", 3) == 0); - fseek (fp, savedFilePosition, SEEK_SET); + ape_fseek (fp, savedFilePosition, SEEK_SET); return (n-1)*128; } @@ -76,18 +77,18 @@ (some bugy tagers add this again and again ) 0 no tag at all */ int -is_id3v2 (FILE * fp) +is_id3v2 (ape_file * fp) { char buf[16]; size_t savedFilePosition; long id3v2size=0; - savedFilePosition = ftell (fp); - fseek (fp, 0, SEEK_SET); + savedFilePosition = ape_ftell (fp); + ape_fseek (fp, 0, SEEK_SET); do { memset (buf, 0, sizeof (buf)); - fseek (fp, id3v2size, SEEK_SET); - fread (&buf, 1, sizeof (buf), fp); + ape_fseek (fp, id3v2size, SEEK_SET); + ape_fread (&buf, 1, sizeof (buf), fp); if (memcmp (buf, "ID3", 3) != 0) { break; } @@ -96,7 +97,7 @@ ((long) (buf[7]) << 14) | ((long) (buf[6]) << 21)); } while(memcmp (buf, "ID3", 3) == 0); - fseek (fp, savedFilePosition, SEEK_SET); + ape_fseek (fp, savedFilePosition, SEEK_SET); return (int) id3v2size; } @@ -108,22 +109,22 @@ \return Version of ape tag if any, else 0 */ int -is_ape_ver (FILE * fp) +is_ape_ver (ape_file * fp) { char unsigned buf[32]; size_t savedFilePosition; - savedFilePosition = ftell (fp); + savedFilePosition = ape_ftell (fp); memset (buf, 0, sizeof (buf)); - fseek (fp, (is_id3v1 (fp) ? -32 - 128 : -32), SEEK_END); - fread (&buf, 1, sizeof (buf), fp); + ape_fseek (fp, (is_id3v1 (fp) ? -32 - 128 : -32), SEEK_END); + ape_fread (&buf, 1, sizeof (buf), fp); if (memcmp (buf, "APETAGEX", 8) != 0) { - fseek (fp, savedFilePosition, SEEK_SET); + ape_fseek (fp, savedFilePosition, SEEK_SET); return 0; } - fseek (fp, savedFilePosition, SEEK_SET); + ape_fseek (fp, savedFilePosition, SEEK_SET); return (int) is_tag_ape2long (buf + 8); } @@ -136,22 +137,22 @@ \return Size of ape tag if any, else 0 */ int -is_ape (FILE * fp) +is_ape (ape_file * fp) { char unsigned buf[32]; size_t savedFilePosition; - savedFilePosition = ftell (fp); + savedFilePosition = ape_ftell(fp); memset (buf, 0, sizeof (buf)); - fseek (fp, (is_id3v1 (fp) ? -32 - 128 : -32), SEEK_END); - fread (&buf, 1, sizeof (buf), fp); + ape_fseek (fp, (is_id3v1 (fp) ? -32 - 128 : -32), SEEK_END); + ape_fread (&buf, 1, sizeof (buf), fp); if (memcmp (buf, "APETAGEX", 8) != 0) { - fseek (fp, savedFilePosition, SEEK_SET); + ape_fseek (fp, savedFilePosition, SEEK_SET); return 0; } - fseek (fp, savedFilePosition, SEEK_SET); + ape_fseek (fp, savedFilePosition, SEEK_SET); /* WARNING! macabra code */ return (int) (is_tag_ape2long (buf + 8 + 4) + ( diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/is_tag.h xbmc-10.00~svn34731/xbmc/lib/libapetag/is_tag.h --- xbmc-10.00~svn33778/xbmc/lib/libapetag/is_tag.h 2010-01-22 07:22:36.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/is_tag.h 2010-09-29 20:05:43.000000000 +0000 @@ -30,12 +30,12 @@ All is_* function restore file positon on return */ -int is_id3v1 (FILE * fp); +int is_id3v1 (ape_file * fp); -int is_id3v2 (FILE * fp); +int is_id3v2 (ape_file * fp); -int is_ape (FILE * fp); +int is_ape (ape_file * fp); -int is_ape_ver (FILE * fp); +int is_ape_ver (ape_file * fp); #endif /* _IS_TAG_H */ diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/libapetag.vcproj xbmc-10.00~svn34731/xbmc/lib/libapetag/libapetag.vcproj --- xbmc-10.00~svn33778/xbmc/lib/libapetag/libapetag.vcproj 2010-05-17 18:25:38.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/libapetag.vcproj 2010-09-29 20:05:43.000000000 +0000 @@ -158,6 +158,14 @@ > + + + + diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/libapetag.vcxproj xbmc-10.00~svn34731/xbmc/lib/libapetag/libapetag.vcxproj --- xbmc-10.00~svn33778/xbmc/lib/libapetag/libapetag.vcxproj 2010-05-18 08:22:01.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/libapetag.vcxproj 2010-09-30 00:27:53.000000000 +0000 @@ -83,6 +83,7 @@ + @@ -90,6 +91,7 @@ + diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/Makefile.am xbmc-10.00~svn34731/xbmc/lib/libapetag/Makefile.am --- xbmc-10.00~svn33778/xbmc/lib/libapetag/Makefile.am 2010-01-22 07:22:36.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/Makefile.am 2010-09-29 20:05:43.000000000 +0000 @@ -9,7 +9,8 @@ apetaglib.c \ is_tag.c \ info_mac.c \ - info_mpc.c + info_mpc.c \ + file_io.c if COMPILE_WITH_ID3 libapetag_la_SOURCES += id3v2_read.c diff -Nru xbmc-10.00~svn33778/xbmc/lib/libapetag/Makefile.in xbmc-10.00~svn34731/xbmc/lib/libapetag/Makefile.in --- xbmc-10.00~svn33778/xbmc/lib/libapetag/Makefile.in 2010-01-22 07:22:36.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libapetag/Makefile.in 2010-09-29 20:05:43.000000000 +0000 @@ -80,10 +80,10 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libapetag_la_LIBADD = am__libapetag_la_SOURCES_DIST = apetaglib.c is_tag.c info_mac.c \ - info_mpc.c id3v2_read.c + info_mpc.c file_io.c id3v2_read.c @COMPILE_WITH_ID3_TRUE@am__objects_1 = id3v2_read.lo am_libapetag_la_OBJECTS = apetaglib.lo is_tag.lo info_mac.lo \ - info_mpc.lo $(am__objects_1) + info_mpc.lo file_io.lo $(am__objects_1) libapetag_la_OBJECTS = $(am_libapetag_la_OBJECTS) libapetag_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -236,7 +236,7 @@ lib_LTLIBRARIES = libapetag.la include_HEADERS = apetaglib.h libapetag_la_SOURCES = apetaglib.c is_tag.c info_mac.c info_mpc.c \ - $(am__append_1) + file_io.c $(am__append_1) libapetag_la_LDFLAGS = -version-info @APETAG_VERSION@ EXTRA_DIST = \ COPYING.LGPL \ @@ -339,6 +339,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apetaglib.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_io.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3v2_read.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info_mac.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info_mpc.Plo@am__quote@ diff -Nru xbmc-10.00~svn33778/xbmc/lib/libjsonrpc/JSONRPC.cpp xbmc-10.00~svn34731/xbmc/lib/libjsonrpc/JSONRPC.cpp --- xbmc-10.00~svn33778/xbmc/lib/libjsonrpc/JSONRPC.cpp 2010-09-13 07:35:17.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libjsonrpc/JSONRPC.cpp 2010-09-24 14:51:44.000000000 +0000 @@ -121,7 +121,7 @@ { "VideoPlaylist.Add", CAVPlaylistOperations::Add, Response, ControlPlayback, "" }, { "VideoPlaylist.Clear", CAVPlaylistOperations::Clear, Response, ControlPlayback, "Clear video playlist" }, { "VideoPlaylist.Shuffle", CAVPlaylistOperations::Shuffle, Response, ControlPlayback, "Shuffle video playlist" }, - { "VideoPlaylist.UnShuffle", CAVPlaylistOperations::Shuffle, Response, ControlPlayback, "Shuffle video playlist" }, + { "VideoPlaylist.UnShuffle", CAVPlaylistOperations::UnShuffle, Response, ControlPlayback, "UnShuffle video playlist" }, // AudioPlaylist { "AudioPlaylist.Play", CAVPlaylistOperations::Play, Response, ControlPlayback, "" }, @@ -132,7 +132,7 @@ { "AudioPlaylist.Add", CAVPlaylistOperations::Add, Response, ControlPlayback, "" }, { "AudioPlaylist.Clear", CAVPlaylistOperations::Clear, Response, ControlPlayback, "Clear audio playlist" }, { "AudioPlaylist.Shuffle", CAVPlaylistOperations::Shuffle, Response, ControlPlayback, "Shuffle audio playlist" }, - { "AudioPlaylist.UnShuffle", CAVPlaylistOperations::Shuffle, Response, ControlPlayback, "Shuffle audio playlist" }, + { "AudioPlaylist.UnShuffle", CAVPlaylistOperations::UnShuffle, Response, ControlPlayback, "UnShuffle audio playlist" }, // Playlist { "Playlist.Create", CPlaylistOperations::Create, Response, ReadData, "Creates a virtual playlist from a given one from a file" }, @@ -143,6 +143,7 @@ { "Playlist.Remove", CPlaylistOperations::Remove, Response, ControlPlayback, "Remove items in the playlist. Parameter example {\"playlist\": \"music\", \"item\": 0 }. playlist optional." }, { "Playlist.Swap", CPlaylistOperations::Swap, Response, ControlPlayback, "Swap items in the playlist. Parameter example {\"playlist\": \"music\", \"item1\": 0, \"item2\": 1 }. playlist optional." }, { "Playlist.Shuffle", CPlaylistOperations::Shuffle, Response, ControlPlayback, "Shuffle playlist" }, + { "Playlist.UnShuffle", CPlaylistOperations::UnShuffle, Response, ControlPlayback, "UnShuffle playlist" }, // File { "Files.GetSources", CFileOperations::GetRootDirectory, Response, ReadData, "Get the sources of the media windows. Parameter example {\"media\": \"video\"}. Media can be video, music, pictures or files" }, diff -Nru xbmc-10.00~svn33778/xbmc/lib/libjsonrpc/TCPServer.cpp xbmc-10.00~svn34731/xbmc/lib/libjsonrpc/TCPServer.cpp --- xbmc-10.00~svn33778/xbmc/lib/libjsonrpc/TCPServer.cpp 2010-09-11 23:36:11.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libjsonrpc/TCPServer.cpp 2010-09-22 20:05:57.000000000 +0000 @@ -276,8 +276,8 @@ m_endBrackets++; if (m_beginBrackets > 0 && m_endBrackets > 0 && m_beginBrackets == m_endBrackets) { - CSingleLock lock (m_critSection); std::string line = CJSONRPC::MethodCall(m_buffer, host, this); + CSingleLock lock (m_critSection); send(m_socket, line.c_str(), line.size(), 0); m_beginBrackets = m_endBrackets = 0; m_buffer.clear(); diff -Nru xbmc-10.00~svn33778/xbmc/lib/libPython/Python/Python/import.c xbmc-10.00~svn34731/xbmc/lib/libPython/Python/Python/import.c --- xbmc-10.00~svn33778/xbmc/lib/libPython/Python/Python/import.c 2008-07-15 18:34:24.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libPython/Python/Python/import.c 2010-10-04 16:12:45.000000000 +0000 @@ -11,6 +11,9 @@ #include "eval.h" #include "osdefs.h" #include "importdl.h" +#ifdef MS_WINDOWS + #include +#endif #ifdef HAVE_FCNTL_H #include @@ -660,6 +663,8 @@ for the compiled file, or NULL if there's no space in the buffer. Doesn't set an exception. */ +#define XBMC_HOME_PATH "special://home/" +#define XBMC_ROOT_PATH "special://xbmc/" static char * make_compiled_pathname(char *pathname, char *buf, size_t buflen) { @@ -677,6 +682,13 @@ buf[len] = Py_OptimizeFlag ? 'o' : 'c'; buf[len+1] = '\0'; +#ifdef MS_WINDOWS + /* XBMC hack: + We don't have write access on the XBMC_ROOT path. Redirects everything + to XBMC_HOME. */ + if (strncmp(pathname, XBMC_ROOT_PATH, strlen(XBMC_ROOT_PATH)) == 0) + memcpy(buf + 10, "home", 4); +#endif return buf; } @@ -798,6 +810,36 @@ writable, the file will never be written. Oh well. */ int fd; + +#ifdef MS_WINDOWS + /* Since we're redirecting everything from XBMC_ROOT to + XBMC_HOME, there's a chance that the directory does not + exist. In this case, we need to create it. */ + if (strncmp(filename, XBMC_HOME_PATH, strlen(XBMC_HOME_PATH)) == 0) + { + char *buf = filename + strlen(XBMC_HOME_PATH); + char *path = strdup(filename); + while (*(buf++)) + { + if ((*buf == '/') || (*buf == '\\')) + { + memcpy(path, filename, buf - filename); + path[buf - filename] = '\0'; + if (access(path, 0) == -1) + { + if (mkdir(path) != 0) + { + free(path); + return NULL; + } + } + } + } + free(path); + } +#endif + + (void) unlink(filename); fd = open(filename, O_EXCL|O_CREAT|O_WRONLY|O_TRUNC #ifdef O_BINARY diff -Nru xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/controlslider.cpp xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/controlslider.cpp --- xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/controlslider.cpp 2010-03-25 01:40:45.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/controlslider.cpp 2010-09-15 08:40:59.000000000 +0000 @@ -127,10 +127,28 @@ return Py_BuildValue((char*)"f", 0); } + PyDoc_STRVAR(setPercent__doc__, + "setPercent(50) -- Sets the percent of the slider.\n" + "\n" + "example:\n" + "self.slider.setPercent(50)\n"); + + PyObject* ControlSlider_SetPercent(ControlProgress *self, PyObject *args) + { + float fPercent = 0; + if (!PyArg_ParseTuple(args, (char*)"f", &fPercent)) return NULL; + + if (self->pGUIControl) + ((CGUISliderControl*)self->pGUIControl)->SetPercentage(fPercent); + + Py_INCREF(Py_None); + return Py_None; + } PyMethodDef ControlSlider_methods[] = { {(char*)"getPercent", (PyCFunction)ControlSlider_GetPercent, METH_VARARGS, getPercent__doc__}, + {(char*)"setPercent", (PyCFunction)ControlSlider_SetPercent, METH_VARARGS, setPercent__doc__}, {NULL, NULL, 0, NULL} }; diff -Nru xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h --- xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h 2010-06-20 12:47:51.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h 2010-10-05 22:04:00.000000000 +0000 @@ -53,7 +53,9 @@ PyXBMCAction(PyObject* callback) : param(0), pCallbackWindow(callback), pObject(NULL), controlId(0), type(0) { + PyEval_AcquireLock(); Py_INCREF(callback); + PyEval_ReleaseLock(); } virtual ~PyXBMCAction() ; }; diff -Nru xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp --- xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp 2010-06-27 02:41:39.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp 2010-10-12 22:01:06.000000000 +0000 @@ -124,7 +124,7 @@ } break; - case GUI_MSG_SETFOCUS: + case GUI_MSG_FOCUSED: { if (m_viewControl.HasControl(message.GetControlId()) && m_viewControl.GetCurrentControl() != (int)message.GetControlId()) { diff -Nru xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/listitem.cpp xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/listitem.cpp --- xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/listitem.cpp 2010-08-31 17:40:15.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/listitem.cpp 2010-10-12 21:50:59.000000000 +0000 @@ -246,14 +246,18 @@ PyObject* ListItem_SetIconImage(ListItem *self, PyObject *args) { - char *cLine = NULL; + PyObject* unicodeLine = NULL; if (!self->item) return NULL; - if (!PyArg_ParseTuple(args, (char*)"s", &cLine)) return NULL; + if (!PyArg_ParseTuple(args, (char*)"O", &unicodeLine)) return NULL; + + string utf8Line; + if (unicodeLine && !PyXBMCGetUnicodeString(utf8Line, unicodeLine, 1)) + return NULL; // set label PyXBMCGUILock(); - self->item->SetIconImage(cLine ? cLine : ""); + self->item->SetIconImage(utf8Line); PyXBMCGUIUnlock(); Py_INCREF(Py_None); @@ -270,14 +274,18 @@ PyObject* ListItem_SetThumbnailImage(ListItem *self, PyObject *args) { - char *cLine = NULL; + PyObject* unicodeLine = NULL; if (!self->item) return NULL; - if (!PyArg_ParseTuple(args, (char*)"s", &cLine)) return NULL; + if (!PyArg_ParseTuple(args, (char*)"O", &unicodeLine)) return NULL; + + string utf8Line; + if (unicodeLine && !PyXBMCGetUnicodeString(utf8Line, unicodeLine, 1)) + return NULL; // set label PyXBMCGUILock(); - self->item->SetThumbnailImage(cLine ? cLine : ""); + self->item->SetThumbnailImage(utf8Line); PyXBMCGUIUnlock(); Py_INCREF(Py_None); diff -Nru xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/player.cpp xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/player.cpp --- xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/player.cpp 2010-08-28 00:24:11.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/player.cpp 2010-09-23 21:49:05.000000000 +0000 @@ -472,7 +472,12 @@ // Player_SetSubtitles PyDoc_STRVAR(setSubtitles__doc__, - "setSubtitles() -- set subtitle file and enable subtitles\n"); + "setSubtitles(path) -- set subtitle file and enable subtitles\n" + "\n" + "path : string or unicode - Path to subtitle\n" + "\n" + "example:\n" + " - setSubtitles('/path/to/subtitle/test.srt')\n"); PyObject* Player_SetSubtitles(PyObject *self, PyObject *args) { @@ -486,6 +491,8 @@ { g_application.m_pPlayer->SetSubtitle(nStream); g_application.m_pPlayer->SetSubtitleVisible(true); + g_settings.m_currentVideoSettings.m_SubtitleDelay = 0.0f; + g_application.m_pPlayer->SetSubTitleDelay(g_settings.m_currentVideoSettings.m_SubtitleDelay); } } diff -Nru xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/window.cpp xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/window.cpp --- xbmc-10.00~svn33778/xbmc/lib/libPython/xbmcmodule/window.cpp 2010-06-27 02:41:00.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libPython/xbmcmodule/window.cpp 2010-10-04 22:06:40.000000000 +0000 @@ -390,7 +390,7 @@ if (WindowDialog_Check(self) || WindowXMLDialog_Check(self)) { Py_BEGIN_ALLOW_THREADS - ThreadMessage tMsg = {TMSG_GUI_PYTHON_DIALOG, 1, 1}; + ThreadMessage tMsg = {TMSG_GUI_PYTHON_DIALOG, WindowXMLDialog_Check(self) ? 1 : 0, 1}; tMsg.lpVoid = self->pWindow; g_application.getApplicationMessenger().SendMessage(tMsg, true); Py_END_ALLOW_THREADS @@ -430,7 +430,7 @@ if (WindowDialog_Check(self) || WindowXMLDialog_Check(self)) { Py_BEGIN_ALLOW_THREADS - ThreadMessage tMsg = {TMSG_GUI_PYTHON_DIALOG, 1, 0}; + ThreadMessage tMsg = {TMSG_GUI_PYTHON_DIALOG, WindowXMLDialog_Check(self) ? 1 : 0, 0}; tMsg.lpVoid = self->pWindow; g_application.getApplicationMessenger().SendMessage(tMsg, true); Py_END_ALLOW_THREADS diff -Nru xbmc-10.00~svn33778/xbmc/lib/libPython/XBPython.cpp xbmc-10.00~svn34731/xbmc/lib/libPython/XBPython.cpp --- xbmc-10.00~svn33778/xbmc/lib/libPython/XBPython.cpp 2010-08-03 04:09:14.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libPython/XBPython.cpp 2010-10-09 13:00:44.000000000 +0000 @@ -390,7 +390,13 @@ #endif /* USE_EXTERNAL_PYTHON */ Py_Initialize(); - PyEval_InitThreads(); + // If this is not the first time we initialize Python, the interpreter + // lock already exists and we need to lock it as PyEval_InitThreads + // would not do that in that case. + if (PyEval_ThreadsInitialized()) + PyEval_AcquireLock(); + else + PyEval_InitThreads(); char* python_argv[1] = { (char*)"" } ; PySys_SetArgv(1, python_argv); diff -Nru xbmc-10.00~svn33778/xbmc/lib/libPython/XBPythonDll.cpp xbmc-10.00~svn34731/xbmc/lib/libPython/XBPythonDll.cpp --- xbmc-10.00~svn33778/xbmc/lib/libPython/XBPythonDll.cpp 2010-07-19 16:46:35.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libPython/XBPythonDll.cpp 2010-10-09 13:00:44.000000000 +0000 @@ -61,6 +61,7 @@ FUNCTION(PyRun_SimpleStringFlags) FUNCTION(PyRun_SimpleFileExFlags) FUNCTION(PyEval_InitThreads) + FUNCTION(PyEval_ThreadsInitialized) FUNCTION(Py_Initialize) FUNCTION(Py_IsInitialized) FUNCTION(Py_Finalize) @@ -177,6 +178,7 @@ dll.ResolveExport(DLL_FUNCTION(PyRun_SimpleStringFlags)) && dll.ResolveExport(DLL_FUNCTION(PyRun_SimpleFileExFlags)) && dll.ResolveExport(DLL_FUNCTION(PyEval_InitThreads)) && + dll.ResolveExport(DLL_FUNCTION(PyEval_ThreadsInitialized)) && dll.ResolveExport(DLL_FUNCTION(Py_Initialize)) && dll.ResolveExport(DLL_FUNCTION(Py_IsInitialized)) && dll.ResolveExport(DLL_FUNCTION(Py_Finalize)) && diff -Nru xbmc-10.00~svn33778/xbmc/lib/libPython/XBPythonDllFuncs.S xbmc-10.00~svn34731/xbmc/lib/libPython/XBPythonDllFuncs.S --- xbmc-10.00~svn33778/xbmc/lib/libPython/XBPythonDllFuncs.S 2010-07-19 16:46:35.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libPython/XBPythonDllFuncs.S 2010-10-09 13:00:44.000000000 +0000 @@ -62,6 +62,7 @@ FUNCTION(PyRun_SimpleStringFlags) FUNCTION(PyRun_SimpleFileExFlags) FUNCTION(PyEval_InitThreads) + FUNCTION(PyEval_ThreadsInitialized) FUNCTION(Py_Initialize) FUNCTION(Py_IsInitialized) FUNCTION(Py_Finalize) diff -Nru xbmc-10.00~svn33778/xbmc/lib/libshout/rip_manager.c xbmc-10.00~svn34731/xbmc/lib/libshout/rip_manager.c --- xbmc-10.00~svn33778/xbmc/lib/libshout/rip_manager.c 2008-07-20 18:27:50.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/lib/libshout/rip_manager.c 2010-10-12 18:26:40.000000000 +0000 @@ -656,9 +656,9 @@ RIP_MANAGER_OPTIONS *rmo) { int ret = 0; - m_started_sem = threadlib_create_sem(); if (m_ripping) return SR_SUCCESS; // to prevent reentrenty + m_started_sem = threadlib_create_sem(); m_ripping = TRUE; diff -Nru xbmc-10.00~svn33778/xbmc/linux/ConsoleDeviceKitPowerSyscall.cpp xbmc-10.00~svn34731/xbmc/linux/ConsoleDeviceKitPowerSyscall.cpp --- xbmc-10.00~svn33778/xbmc/linux/ConsoleDeviceKitPowerSyscall.cpp 2010-05-03 18:13:06.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/linux/ConsoleDeviceKitPowerSyscall.cpp 2010-09-26 21:57:00.000000000 +0000 @@ -47,7 +47,7 @@ CPowerSyscallWithoutEvents::Suspend(); CDBusMessage message("org.freedesktop.DeviceKit.Power", "/org/freedesktop/DeviceKit/Power", "org.freedesktop.DeviceKit.Power", "Suspend"); - return message.SendSystem() != NULL; + return message.SendAsyncSystem(); } bool CConsoleDeviceKitPowerSyscall::Hibernate() @@ -55,7 +55,7 @@ CPowerSyscallWithoutEvents::Hibernate(); CDBusMessage message("org.freedesktop.DeviceKit.Power", "/org/freedesktop/DeviceKit/Power", "org.freedesktop.DeviceKit.Power", "Hibernate"); - return message.SendSystem() != NULL; + return message.SendAsyncSystem(); } bool CConsoleDeviceKitPowerSyscall::Reboot() diff -Nru xbmc-10.00~svn33778/xbmc/linux/ConsoleUPowerSyscall.cpp xbmc-10.00~svn34731/xbmc/linux/ConsoleUPowerSyscall.cpp --- xbmc-10.00~svn33778/xbmc/linux/ConsoleUPowerSyscall.cpp 2010-08-28 08:40:18.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/linux/ConsoleUPowerSyscall.cpp 2010-09-26 21:55:24.000000000 +0000 @@ -77,20 +77,20 @@ { // UPower 0.9.1 does not signal sleeping unless you tell that its about to sleep... CDBusMessage aboutToSleepMessage("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "AboutToSleep"); - aboutToSleepMessage.SendSystem(); + aboutToSleepMessage.SendAsyncSystem(); CDBusMessage message("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Suspend"); - return message.SendSystem() != NULL; + return message.SendAsyncSystem(); } bool CConsoleUPowerSyscall::Hibernate() { // UPower 0.9.1 does not signal sleeping unless you tell that its about to sleep... CDBusMessage aboutToSleepMessage("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "AboutToSleep"); - aboutToSleepMessage.SendSystem(); + aboutToSleepMessage.SendAsyncSystem(); CDBusMessage message("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Hibernate"); - return message.SendSystem() != NULL; + return message.SendAsyncSystem(); } bool CConsoleUPowerSyscall::Reboot() diff -Nru xbmc-10.00~svn33778/xbmc/linux/DBusMessage.cpp xbmc-10.00~svn34731/xbmc/linux/DBusMessage.cpp --- xbmc-10.00~svn33778/xbmc/linux/DBusMessage.cpp 2010-01-23 17:13:41.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/linux/DBusMessage.cpp 2010-09-26 21:55:07.000000000 +0000 @@ -19,8 +19,8 @@ * */ #include "DBusMessage.h" -#include "log.h" #ifdef HAS_DBUS +#include "log.h" CDBusMessage::CDBusMessage(const char *destination, const char *object, const char *interface, const char *method) { @@ -71,6 +71,16 @@ return Send(DBUS_BUS_SESSION); } +bool CDBusMessage::SendAsyncSystem() +{ + return SendAsync(DBUS_BUS_SYSTEM); +} + +bool CDBusMessage::SendAsyncSession() +{ + return SendAsync(DBUS_BUS_SESSION); +} + DBusMessage *CDBusMessage::Send(DBusBusType type) { DBusError error; @@ -88,6 +98,18 @@ return returnMessage; } +bool CDBusMessage::SendAsync(DBusBusType type) +{ + DBusError error; + dbus_error_init (&error); + DBusConnection *con = dbus_bus_get(type, &error); + + if (con && m_message) + return dbus_connection_send(con, m_message, NULL); + else + return false; +} + DBusMessage *CDBusMessage::Send(DBusConnection *con, DBusError *error) { if (con && m_message) diff -Nru xbmc-10.00~svn33778/xbmc/linux/DBusMessage.h xbmc-10.00~svn34731/xbmc/linux/DBusMessage.h --- xbmc-10.00~svn33778/xbmc/linux/DBusMessage.h 2010-03-18 17:07:43.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/linux/DBusMessage.h 2010-09-26 21:55:07.000000000 +0000 @@ -21,10 +21,7 @@ */ #include "system.h" #ifdef HAS_DBUS -#include "StdString.h" -#include "log.h" #include -#include class CDBusMessage { @@ -38,9 +35,16 @@ DBusMessage *SendSystem(); DBusMessage *SendSession(); + + bool SendAsyncSystem(); + bool SendAsyncSession(); + DBusMessage *Send(DBusBusType type); DBusMessage *Send(DBusConnection *con, DBusError *error); private: + + bool SendAsync(DBusBusType type); + void Close(); void PrepareArgument(); diff -Nru xbmc-10.00~svn33778/xbmc/linux/DBusUtil.cpp xbmc-10.00~svn34731/xbmc/linux/DBusUtil.cpp --- xbmc-10.00~svn33778/xbmc/linux/DBusUtil.cpp 2010-02-05 08:20:44.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/linux/DBusUtil.cpp 2010-09-26 21:55:07.000000000 +0000 @@ -20,6 +20,7 @@ */ #include "DBusUtil.h" #ifdef HAS_DBUS +#include "log.h" CVariant CDBusUtil::GetVariant(const char *destination, const char *object, const char *interface, const char *property) { diff -Nru xbmc-10.00~svn33778/xbmc/linux/HALPowerSyscall.cpp xbmc-10.00~svn34731/xbmc/linux/HALPowerSyscall.cpp --- xbmc-10.00~svn33778/xbmc/linux/HALPowerSyscall.cpp 2010-08-31 08:00:10.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/linux/HALPowerSyscall.cpp 2010-09-30 10:17:21.000000000 +0000 @@ -83,6 +83,7 @@ dbus_int32_t int32 = 0; if (connection) { + bool result = false; msg = dbus_message_new_method_call("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.SystemPowerManagement", powerstate); if (msg && strcmp(powerstate, "Suspend") == 0) @@ -95,25 +96,15 @@ CLog::Log(LOGERROR, "DBus: Create PowerManagement Message failed"); else { - DBusMessage *reply; - reply = dbus_connection_send_with_reply_and_block(connection, msg, -1, &error); - if (dbus_error_is_set(&error)) - { - CLog::Log(LOGERROR, "DBus: %s - %s", error.name, error.message); - if (strcmp(error.name, "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") == 0) - g_application.m_guiDialogKaiToast.QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(257), g_localizeStrings.Get(13020)); - - return false; - } + result = dbus_connection_send(connection, msg, NULL); // Need to create a reader for the Message - dbus_message_unref (reply); dbus_message_unref(msg); msg = NULL; } dbus_connection_unref(connection); connection = NULL; - return true; + return result; } return false; } diff -Nru xbmc-10.00~svn33778/xbmc/linux/XRandR.cpp xbmc-10.00~svn34731/xbmc/linux/XRandR.cpp --- xbmc-10.00~svn33778/xbmc/linux/XRandR.cpp 2010-05-15 16:37:09.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/linux/XRandR.cpp 2010-10-10 18:44:23.000000000 +0000 @@ -97,6 +97,7 @@ if (!xoutput.isConnected) continue; + bool hascurrent = false; for (TiXmlElement* mode = output->FirstChildElement("mode"); mode; mode = mode->NextSiblingElement("mode")) { XMode xmode; @@ -111,9 +112,13 @@ if (xmode.isCurrent) { m_current.push_back(xoutput); + hascurrent = true; } } - m_outputs.push_back(xoutput); + if (hascurrent) + m_outputs.push_back(xoutput); + else + CLog::Log(LOGWARNING, "CXRandR::Query - output %s has no current mode, assuming disconnected", xoutput.name.c_str()); } return m_outputs.size() > 0; } diff -Nru xbmc-10.00~svn33778/xbmc/Makefile.in xbmc-10.00~svn34731/xbmc/Makefile.in --- xbmc-10.00~svn33778/xbmc/Makefile.in 2010-07-29 20:47:28.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/Makefile.in 2010-10-04 17:48:26.000000000 +0000 @@ -71,7 +71,6 @@ MusicInfoTagLoaderDatabase.cpp \ MusicInfoTagLoaderFactory.cpp \ MusicInfoTagLoaderFlac.cpp \ - MusicInfoTagLoaderGYM.cpp \ MusicInfoTagLoaderMidi.cpp \ MusicInfoTagLoaderMod.cpp \ MusicInfoTagLoaderMP3.cpp \ diff -Nru xbmc-10.00~svn33778/xbmc/MusicDatabase.cpp xbmc-10.00~svn34731/xbmc/MusicDatabase.cpp --- xbmc-10.00~svn33778/xbmc/MusicDatabase.cpp 2010-09-13 07:35:17.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/MusicDatabase.cpp 2010-10-08 19:24:18.000000000 +0000 @@ -2345,18 +2345,14 @@ } else pCdInfo->SetNoCDDBInfo(); - - pDialogProgress->Close(); } else if (lasterror == E_NO_MATCH_FOUND) { pCdInfo->SetNoCDDBInfo(); - pDialogProgress->Close(); } else { pCdInfo->SetNoCDDBInfo(); - pDialogProgress->Close(); // ..no, an error occured, display it to the user CGUIDialogOK *pDialogOK = (CGUIDialogOK *)g_windowManager.GetWindow(WINDOW_DIALOG_OK); if (pDialogOK) @@ -2372,7 +2368,8 @@ } } } // if ( !cddb.queryCDinfo( pCdInfo ) ) - pDialogProgress->Close(); + else + pDialogProgress->Close(); } // if (pCdInfo->HasCDDBInfo() && g_settings.m_bUseCDDB) // Filling the file items with cddb info happens in CMusicInfoTagLoaderCDDA @@ -4232,7 +4229,7 @@ if (progress) { - progress->SetHeading(648); + progress->SetHeading(20197); progress->SetLine(0, 649); progress->SetLine(1, 330); progress->SetLine(2, ""); diff -Nru xbmc-10.00~svn33778/xbmc/MusicInfoScanner.cpp xbmc-10.00~svn34731/xbmc/MusicInfoScanner.cpp --- xbmc-10.00~svn33778/xbmc/MusicInfoScanner.cpp 2010-09-13 07:35:17.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/MusicInfoScanner.cpp 2010-09-29 12:08:17.000000000 +0000 @@ -447,7 +447,7 @@ continue; // dont try reading id3tags for folders, playlists or shoutcast streams - if (!pItem->m_bIsFolder && !pItem->IsPlayList() && !pItem->IsPicture() && !pItem->IsLyrics() ) + if (!pItem->m_bIsFolder && !pItem->IsPlayList() && !pItem->IsShoutCast() && !pItem->IsPicture() && !pItem->IsLyrics() ) { m_currentItem++; // CLog::Log(LOGDEBUG, "%s - Reading tag for: %s", __FUNCTION__, pItem->m_strPath.c_str()); diff -Nru xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderFactory.cpp xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderFactory.cpp --- xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderFactory.cpp 2010-08-31 08:00:10.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderFactory.cpp 2010-10-04 17:48:26.000000000 +0000 @@ -40,7 +40,6 @@ #endif #include "MusicInfoTagLoaderNSF.h" #include "MusicInfoTagLoaderSPC.h" -#include "MusicInfoTagLoaderGYM.h" #include "MusicInfoTagLoaderYM.h" #include "MusicInfoTagLoaderDatabase.h" #include "MusicInfoTagLoaderASAP.h" @@ -159,11 +158,6 @@ CMusicInfoTagLoaderSPC *pTagLoader = new CMusicInfoTagLoaderSPC(); return (IMusicInfoTagLoader*)pTagLoader; } - else if (strExtension == "gym") - { - CMusicInfoTagLoaderGYM *pTagLoader = new CMusicInfoTagLoaderGYM(); - return (IMusicInfoTagLoader*)pTagLoader; - } else if (strExtension == "ym") { CMusicInfoTagLoaderYM *pTagLoader = new CMusicInfoTagLoaderYM(); diff -Nru xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderGYM.cpp xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderGYM.cpp --- xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderGYM.cpp 2009-09-20 09:39:41.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderGYM.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2005-2008 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -#include "MusicInfoTagLoaderGYM.h" -#include "MusicInfoTag.h" -#include "utils/log.h" - -#include - -using namespace MUSIC_INFO; - -CMusicInfoTagLoaderGYM::CMusicInfoTagLoaderGYM(void) -{ - m_gym = 0; -} - -CMusicInfoTagLoaderGYM::~CMusicInfoTagLoaderGYM() -{ -} - -bool CMusicInfoTagLoaderGYM::Load(const CStdString& strFileName, CMusicInfoTag& tag) -{ - tag.SetLoaded(false); - - if (!m_dll.Load()) - return false; - - m_dll.Init(); - - m_gym = m_dll.LoadGYM(strFileName.c_str()); - if (!m_gym) - { - CLog::Log(LOGERROR,"MusicInfoTagLoaderGYM: failed to open GYM %s",strFileName.c_str()); - return false; - } - - tag.SetURL(strFileName); - - tag.SetLoaded(false); - char* szTitle = (char*)m_dll.GetTitle(m_gym); // no alloc - if (szTitle) - if( strcmp(szTitle,"") ) - { - tag.SetTitle(szTitle); - tag.SetLoaded(true); - } - - char* szArtist = (char*)m_dll.GetArtist(m_gym); // no alloc - if (szArtist) - if( strcmp(szArtist,"") && tag.Loaded() ) - tag.SetArtist(szArtist); - - m_dll.FreeGYM(m_gym); - m_gym = 0; - - return tag.Loaded(); -} diff -Nru xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderGYM.h xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderGYM.h --- xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderGYM.h 2008-05-17 22:18:44.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderGYM.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#pragma once -/* - * Copyright (C) 2005-2008 Team XBMC - * http://www.xbmc.org - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with XBMC; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -#include "ImusicInfoTagLoader.h" -#include "cores/paplayer/DllGensApu.h" - -namespace MUSIC_INFO -{ - class CMusicInfoTagLoaderGYM: public IMusicInfoTagLoader - { - public: - CMusicInfoTagLoaderGYM(void); - virtual ~CMusicInfoTagLoaderGYM(); - - virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag); - private: - int m_gym; - DllGensApu m_dll; - }; -} diff -Nru xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderNSF.cpp xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderNSF.cpp --- xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderNSF.cpp 2009-09-20 09:39:41.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderNSF.cpp 2010-10-04 17:49:31.000000000 +0000 @@ -71,14 +71,14 @@ tag.SetLoaded(false); char* szTitle = (char*)m_dll.GetTitle(m_nsf); // no alloc - if( strcmp(szTitle,"") ) + if( szTitle && strcmp(szTitle,"") ) { tag.SetTitle(szTitle); tag.SetLoaded(true); } char* szArtist = (char*)m_dll.GetArtist(m_nsf); // no alloc - if( strcmp(szArtist,"") && tag.Loaded() ) + if( szArtist && strcmp(szArtist,"") && tag.Loaded() ) tag.SetArtist(szArtist); m_dll.FreeNSF(m_nsf); diff -Nru xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderNSF.h xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderNSF.h --- xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderNSF.h 2008-05-17 22:18:44.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderNSF.h 2010-10-04 17:49:31.000000000 +0000 @@ -34,7 +34,7 @@ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag); virtual int GetStreamCount(const CStdString& strFileName); private: - int m_nsf; + void* m_nsf; DllNosefart m_dll; }; } diff -Nru xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderSid.cpp xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderSid.cpp --- xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderSid.cpp 2009-11-07 06:12:13.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderSid.cpp 2010-09-23 22:33:18.000000000 +0000 @@ -191,8 +191,8 @@ f2.getline(temp,8191); CStdString strTemp(temp); strTemp.MakeLower(); - unsigned int iFind = strTemp.find(strHVSCpath); - if (iFind == string::npos) + int iFind = strTemp.Find(strHVSCpath); + if (iFind < 0) continue; char temp2[1024]; diff -Nru xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderYM.h xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderYM.h --- xbmc-10.00~svn33778/xbmc/MusicInfoTagLoaderYM.h 2008-05-17 22:18:44.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/MusicInfoTagLoaderYM.h 2010-10-04 17:46:47.000000000 +0000 @@ -33,7 +33,7 @@ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag); private: - int m_ym; + void* m_ym; DllStSound m_dll; }; } diff -Nru xbmc-10.00~svn33778/xbmc/NfoFile.cpp xbmc-10.00~svn34731/xbmc/NfoFile.cpp --- xbmc-10.00~svn33778/xbmc/NfoFile.cpp 2010-07-16 19:47:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/NfoFile.cpp 2010-10-08 17:10:12.000000000 +0000 @@ -23,8 +23,6 @@ ////////////////////////////////////////////////////////////////////// #include "NfoFile.h" -#include "MusicDatabase.h" -#include "VideoDatabase.h" #include "utils/IMDB.h" #include "addons/AddonManager.h" #include "FileSystem/File.h" @@ -112,40 +110,21 @@ } vector vecScrapers; - ADDON::ScraperPtr selected; - // Get Selected Scraper - if (m_type == ADDON_SCRAPER_MOVIES || - m_type == ADDON_SCRAPER_MUSICVIDEOS || - m_type == ADDON_SCRAPER_TVSHOWS) - { - CVideoDatabase database; - database.Open(); - selected = database.GetScraperForPath(strPath); - } - if (m_type == ADDON_SCRAPER_ALBUMS || - m_type == ADDON_SCRAPER_ARTISTS) - { - CMusicDatabase database; - database.Open(); - database.GetScraperForPath(strPath2,selected,m_type); - } // add selected scraper - if (selected) - vecScrapers.push_back(selected); + if (m_info) + vecScrapers.push_back(m_info); VECADDONS addons; CAddonMgr::Get().GetAddons(m_type,addons); // first pass - add language based scrapers - if (g_guiSettings.GetBool("scrapers.langfallback")) - AddScrapers(false,addons,vecScrapers); + if (m_info && g_guiSettings.GetBool("scrapers.langfallback")) + AddScrapers(addons,vecScrapers); // add default scraper - if ((selected && selected->ID() != defaultScraper->ID()) || !selected) + if ((m_info && m_info->ID() != defaultScraper->ID()) || !m_info) vecScrapers.push_back(defaultScraper); - AddScrapers(true,addons,vecScrapers); - // search .. int res = -1; for (unsigned int i=0;i& vecScrapers) { for (unsigned i=0;iLanguage().Equals(g_langInfo.GetDVDSubtitleLanguage()) || - scraper->Language().Equals("multi")) - { - if (find(vecScrapers.begin(),vecScrapers.end(),scraper) == vecScrapers.end()) - vecScrapers.push_back(scraper); - } + if (scraper->Language() == m_info->Language() || scraper->Language().Equals("multi")) + vecScrapers.push_back(scraper); } } diff -Nru xbmc-10.00~svn33778/xbmc/NfoFile.h xbmc-10.00~svn34731/xbmc/NfoFile.h --- xbmc-10.00~svn33778/xbmc/NfoFile.h 2010-07-16 19:47:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/NfoFile.h 2010-10-08 17:10:12.000000000 +0000 @@ -85,7 +85,7 @@ ADDON::ScraperPtr m_info; ADDON::TYPE m_type; bool DoScrape(ADDON::ScraperPtr& scraper); - void AddScrapers(bool any, ADDON::VECADDONS& addons, + void AddScrapers(ADDON::VECADDONS& addons, std::vector& vecScrapers); }; diff -Nru xbmc-10.00~svn33778/xbmc/osx/CocoaPowerSyscall.cpp xbmc-10.00~svn34731/xbmc/osx/CocoaPowerSyscall.cpp --- xbmc-10.00~svn33778/xbmc/osx/CocoaPowerSyscall.cpp 2010-07-05 23:48:48.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/osx/CocoaPowerSyscall.cpp 2010-09-26 21:56:29.000000000 +0000 @@ -281,6 +281,7 @@ // if we don't respond, OS will sleep in 30 second. ctx->m_OnSuspend = true; IOAllowPowerChange(ctx->m_root_port, (long)msg_arg); + //CLog::Log(LOGDEBUG, "%s - kIOMessageCanSystemSleep", __FUNCTION__); break; case kIOMessageSystemWillSleep: // System demanded sleep from: @@ -288,7 +289,11 @@ // 2) closing the lid of a laptop. // 3) running out of battery power. ctx->m_OnSuspend = true; + // force processing of this power event. This callback runs + // in main thread so we can do this. + g_powerManager.ProcessEvents(); IOAllowPowerChange(ctx->m_root_port, (long)msg_arg); + //CLog::Log(LOGDEBUG, "%s - kIOMessageSystemWillSleep", __FUNCTION__); // let XBMC know system will sleep // TODO: break; @@ -297,6 +302,7 @@ // let XBMC know system has woke // TODO: ctx->m_OnResume = true; + //CLog::Log(LOGDEBUG, "%s - kIOMessageSystemHasPoweredOn", __FUNCTION__); break; } } diff -Nru xbmc-10.00~svn33778/xbmc/osx/Info.plist xbmc-10.00~svn34731/xbmc/osx/Info.plist --- xbmc-10.00~svn33778/xbmc/osx/Info.plist 2010-09-08 06:25:55.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/osx/Info.plist 2010-10-13 03:56:38.000000000 +0000 @@ -9,7 +9,7 @@ CFBundleExecutable XBMC CFBundleGetInfoString - 10.0-beta2 + 10.0-beta3 CFBundleIconFile xbmc.icns CFBundleIdentifier @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 10.0-beta2 + 10.0-beta3 CFBundleVersion r#### CFBundleSignature diff -Nru xbmc-10.00~svn33778/xbmc/osx/WinSystemOSX.mm xbmc-10.00~svn34731/xbmc/osx/WinSystemOSX.mm --- xbmc-10.00~svn33778/xbmc/osx/WinSystemOSX.mm 2010-08-25 03:16:41.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/osx/WinSystemOSX.mm 2010-09-30 15:28:45.000000000 +0000 @@ -216,7 +216,6 @@ CWinSystemOSX::~CWinSystemOSX() { - DestroyWindowSystem(); }; bool CWinSystemOSX::InitWindowSystem() @@ -235,6 +234,12 @@ bool CWinSystemOSX::DestroyWindowSystem() { + if (m_glContext) + { + NSOpenGLContext* oldContext = (NSOpenGLContext*)m_glContext; + [oldContext release]; + m_glContext = NULL; + } return true; } diff -Nru xbmc-10.00~svn33778/xbmc/PlayListPlayer.cpp xbmc-10.00~svn34731/xbmc/PlayListPlayer.cpp --- xbmc-10.00~svn33778/xbmc/PlayListPlayer.cpp 2010-09-13 07:35:17.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/PlayListPlayer.cpp 2010-09-29 22:11:27.000000000 +0000 @@ -169,8 +169,13 @@ } if (bAutoPlay) + { CFileItemPtr item = playlist[iSong]; - + if ( item->IsShoutCast() ) + { + return ; + } + } Play(iSong, bAutoPlay); if (iSong < playlist.size()) { @@ -256,6 +261,7 @@ break; } + int iPreviousSong = m_iCurrentSong; m_iCurrentSong = iSong; CFileItemPtr item = playlist[m_iCurrentSong]; playlist.SetPlayed(true); @@ -320,6 +326,20 @@ m_failedSongsStart = 0; m_bPlaybackStarted = true; m_bPlayedFirstFile = true; + + if (!item->IsShoutCast()) + { + if (iPreviousSong < 0) + { + CGUIMessage msg(GUI_MSG_PLAYLISTPLAYER_STARTED, 0, 0, m_iCurrentPlayList, m_iCurrentSong, item); + g_windowManager.SendThreadMessage( msg ); + } + else + { + CGUIMessage msg(GUI_MSG_PLAYLISTPLAYER_CHANGED, 0, 0, m_iCurrentPlayList, MAKELONG(m_iCurrentSong, iPreviousSong), item); + g_windowManager.SendThreadMessage(msg); + } + } } void CPlayListPlayer::SetCurrentSong(int iSong) diff -Nru xbmc-10.00~svn33778/xbmc/PowerManager.cpp xbmc-10.00~svn34731/xbmc/PowerManager.cpp --- xbmc-10.00~svn33778/xbmc/PowerManager.cpp 2010-07-19 21:29:23.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/PowerManager.cpp 2010-09-26 21:55:58.000000000 +0000 @@ -149,17 +149,7 @@ { bool success = false; if (CanSuspend()) - { -#if defined(HAVE_LIBCRYSTALHD) - CCrystalHD::GetInstance()->Sleep(); -#endif - -#ifdef HAS_LCD - g_lcd->SetBackLight(0); -#endif - g_Keyboard.ResetState(); success = m_instance->Suspend(); - } if (success) CAnnouncementManager::Announce(System, "xbmc", "Suspend"); @@ -170,14 +160,7 @@ { bool success = false; if (CanHibernate()) - { -#if defined(HAVE_LIBCRYSTALHD) - CCrystalHD::GetInstance()->Sleep(); -#endif - - g_Keyboard.ResetState(); success = m_instance->Hibernate(); - } if (success) CAnnouncementManager::Announce(System, "xbmc", "Hibernate"); @@ -218,20 +201,26 @@ void CPowerManager::OnSleep() { - CLog::Log(LOGNOTICE, "%s: Running sleep jobs", __FUNCTION__); CAnnouncementManager::Announce(System, "xbmc", "Sleep"); + CLog::Log(LOGNOTICE, "%s: Running sleep jobs", __FUNCTION__); - g_application.StopPlaying(); - -#if defined(HAVE_LIBCRYSTALHD) - CCrystalHD::GetInstance()->Sleep(); +#ifdef HAS_LCD + g_lcd->SetBackLight(0); #endif + + g_Keyboard.ResetState(); + + g_application.StopPlaying(); + g_application.StopShutdownTimer(); } void CPowerManager::OnWake() { - CLog::Log(LOGNOTICE, "%s: Running resume jobs", __FUNCTION__); CAnnouncementManager::Announce(System, "xbmc", "Wake"); + CLog::Log(LOGNOTICE, "%s: Running resume jobs", __FUNCTION__); + + // reset out timers + g_application.ResetShutdownTimers(); #ifdef HAS_SDL if (g_Windowing.IsFullScreen()) @@ -249,10 +238,6 @@ g_application.ResetScreenSaver(); #endif -#if defined(HAVE_LIBCRYSTALHD) - CCrystalHD::GetInstance()->Wake(); -#endif - // restart lirc #if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE) CLog::Log(LOGNOTICE, "%s: Restarting lirc", __FUNCTION__); diff -Nru xbmc-10.00~svn33778/xbmc/RenderSystemDX.cpp xbmc-10.00~svn34731/xbmc/RenderSystemDX.cpp --- xbmc-10.00~svn33778/xbmc/RenderSystemDX.cpp 2010-09-10 23:49:32.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/RenderSystemDX.cpp 2010-10-10 16:05:49.000000000 +0000 @@ -36,6 +36,13 @@ #include "Util.h" #include "win32/WIN32Util.h" #include "VideoReferenceClock.h" +#if (D3DX_SDK_VERSION >= 42) //aug 2009 sdk and up use dxerr + #include +#else + #include + #define DXGetErrorString(hr) DXGetErrorString9(hr) + #define DXGetErrorDescription(hr) DXGetErrorDescription9(hr) +#endif using namespace std; @@ -84,7 +91,6 @@ CRenderSystemDX::~CRenderSystemDX() { - DestroyRenderSystem(); } bool CRenderSystemDX::InitRenderSystem() @@ -413,17 +419,16 @@ } } - D3DADAPTER_IDENTIFIER9 AIdentifier; - if(m_pD3D->GetAdapterIdentifier(m_adapter, 0, &AIdentifier) == D3D_OK) + if(m_pD3D->GetAdapterIdentifier(m_adapter, 0, &m_AIdentifier) == D3D_OK) { - m_RenderRenderer = (const char*)AIdentifier.Description; - m_RenderVendor = (const char*)AIdentifier.Driver; - m_RenderVersion.Format("%d.%d.%d.%04d", HIWORD(AIdentifier.DriverVersion.HighPart), LOWORD(AIdentifier.DriverVersion.HighPart), - HIWORD(AIdentifier.DriverVersion.LowPart), LOWORD(AIdentifier.DriverVersion.LowPart)); + m_RenderRenderer = (const char*)m_AIdentifier.Description; + m_RenderVendor = (const char*)m_AIdentifier.Driver; + m_RenderVersion.Format("%d.%d.%d.%04d", HIWORD(m_AIdentifier.DriverVersion.HighPart), LOWORD(m_AIdentifier.DriverVersion.HighPart), + HIWORD(m_AIdentifier.DriverVersion.LowPart) , LOWORD(m_AIdentifier.DriverVersion.LowPart)); } CLog::Log(LOGDEBUG, __FUNCTION__" - adapter %d: %s, %s, VendorId %lu, DeviceId %lu", - m_adapter, AIdentifier.Driver, AIdentifier.Description, AIdentifier.VendorId, AIdentifier.DeviceId); + m_adapter, m_AIdentifier.Driver, m_AIdentifier.Description, m_AIdentifier.VendorId, m_AIdentifier.DeviceId); // get our render capabilities D3DCAPS9 caps; @@ -486,7 +491,7 @@ // see ticket #9269 if(m_defaultD3DUsage == D3DUSAGE_DYNAMIC && m_defaultD3DPool == D3DPOOL_DEFAULT - && AIdentifier.VendorId == 4318) + && m_AIdentifier.VendorId == PCIV_nVidia) { CLog::Log(LOGDEBUG, __FUNCTION__" - nVidia workaround - disabling RENDER_CAPS_DXT_NPOT"); m_renderCaps &= ~RENDER_CAPS_DXT_NPOT; @@ -500,7 +505,7 @@ // See ticket #9578 if(m_defaultD3DUsage == D3DUSAGE_DYNAMIC && m_defaultD3DPool == D3DPOOL_DEFAULT - && AIdentifier.VendorId == 32902) + && m_AIdentifier.VendorId == PCIV_Intel) { CLog::Log(LOGDEBUG, __FUNCTION__" - Intel workaround - specifying minimum pitch for compressed textures."); m_minDXTPitch = 128; @@ -566,10 +571,7 @@ SetThreadPriority(GetCurrentThread(), priority); } - if (m_useD3D9Ex) - hr = ((IDirect3DDevice9Ex*)m_pD3DDevice)->PresentEx(NULL, NULL, 0, NULL, 0); - else - hr = m_pD3DDevice->Present( NULL, NULL, 0, NULL ); + hr = m_pD3DDevice->Present( NULL, NULL, 0, NULL ); if( D3DERR_DEVICELOST == hr ) { @@ -579,7 +581,7 @@ if(FAILED(hr)) { - CLog::Log(LOGDEBUG, "%s - Present failed with hr=%d", __FUNCTION__, hr); + CLog::Log(LOGDEBUG, "%s - Present failed. %s", __FUNCTION__, GetErrorDescription(hr).c_str()); return false; } @@ -608,10 +610,17 @@ m_nDeviceStatus = D3D_OK; break; case D3DERR_DEVICEHUNG: + CLog::Log(LOGERROR, "D3DERR_DEVICEHUNG"); + m_nDeviceStatus = D3DERR_DEVICELOST; + m_needNewDevice = true; + break; case D3DERR_OUTOFVIDEOMEMORY: + CLog::Log(LOGERROR, "D3DERR_OUTOFVIDEOMEMORY"); m_nDeviceStatus = D3DERR_DEVICELOST; + m_needNewDevice = true; break; case D3DERR_DEVICEREMOVED: + CLog::Log(LOGERROR, "D3DERR_DEVICEREMOVED"); m_nDeviceStatus = D3DERR_DEVICELOST; m_needNewDevice = true; // fixme: also needs to re-enumerate and switch to another screen @@ -648,13 +657,15 @@ } } - if(FAILED (m_pD3DDevice->BeginScene())) + HRESULT hr; + + if(FAILED(hr = m_pD3DDevice->BeginScene())) { - CLog::Log(LOGERROR, "m_pD3DDevice->BeginScene() failed"); + CLog::Log(LOGERROR, "m_pD3DDevice->BeginScene() failed. %s", CRenderSystemDX::GetErrorDescription(hr).c_str()); // When XBMC caught an exception after BeginScene(), EndScene() may never been called // and thus all following BeginScene() will fail too. - if(FAILED (m_pD3DDevice->EndScene())) - CLog::Log(LOGERROR, "m_pD3DDevice->EndScene() failed"); + if(FAILED(hr = m_pD3DDevice->EndScene())) + CLog::Log(LOGERROR, "m_pD3DDevice->EndScene() failed. %s", CRenderSystemDX::GetErrorDescription(hr).c_str()); return false; } @@ -677,9 +688,10 @@ if(m_nDeviceStatus != S_OK) return false; - if(FAILED (m_pD3DDevice->EndScene())) + HRESULT hr = m_pD3DDevice->EndScene(); + if(FAILED(hr)) { - CLog::Log(LOGERROR, "m_pD3DDevice->EndScene() failed"); + CLog::Log(LOGERROR, "m_pD3DDevice->EndScene() failed. %s", CRenderSystemDX::GetErrorDescription(hr).c_str()); return false; } @@ -907,4 +919,12 @@ m_resources.erase(i); } +CStdString CRenderSystemDX::GetErrorDescription(HRESULT hr) +{ + CStdString strError; + strError.Format("%X - %s (%s)", hr, DXGetErrorString(hr), DXGetErrorDescription(hr)); + + return strError; +} + #endif diff -Nru xbmc-10.00~svn33778/xbmc/RenderSystemDX.h xbmc-10.00~svn34731/xbmc/RenderSystemDX.h --- xbmc-10.00~svn33778/xbmc/RenderSystemDX.h 2010-08-06 08:20:40.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/RenderSystemDX.h 2010-10-10 16:05:49.000000000 +0000 @@ -28,6 +28,13 @@ #include "RenderSystem.h" #include "CriticalSection.h" +enum PCI_Vendors +{ + PCIV_ATI = 0x1002, + PCIV_nVidia = 0x10DE, + PCIV_Intel = 0x8086 +}; + class ID3DResource; class CRenderSystemDX : public CRenderSystemBase @@ -69,6 +76,7 @@ bool UseD3D9Ex() { return m_useD3D9Ex; } DWORD DefaultD3DUsage() { return m_defaultD3DUsage; } D3DPOOL DefaultD3DPool() { return m_defaultD3DPool; } + D3DADAPTER_IDENTIFIER9 GetAIdentifier() { return m_AIdentifier; } bool Interlaced() { return m_interlaced; } @@ -90,6 +98,8 @@ */ void Unregister(ID3DResource *resource); + static CStdString GetErrorDescription(HRESULT hr); + protected: bool CreateDevice(); void DeleteDevice(); @@ -130,6 +140,7 @@ DWORD m_defaultD3DUsage; D3DPOOL m_defaultD3DPool; bool m_useWindowedDX; + D3DADAPTER_IDENTIFIER9 m_AIdentifier; CCriticalSection m_resourceSection; std::vector m_resources; diff -Nru xbmc-10.00~svn33778/xbmc/RenderSystemGL.cpp xbmc-10.00~svn34731/xbmc/RenderSystemGL.cpp --- xbmc-10.00~svn33778/xbmc/RenderSystemGL.cpp 2010-06-09 22:42:30.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/RenderSystemGL.cpp 2010-09-30 15:28:45.000000000 +0000 @@ -41,7 +41,6 @@ CRenderSystemGL::~CRenderSystemGL() { - DestroyRenderSystem(); } void CRenderSystemGL::CheckOpenGLQuirks() diff -Nru xbmc-10.00~svn33778/xbmc/RenderSystemGLES.cpp xbmc-10.00~svn34731/xbmc/RenderSystemGLES.cpp --- xbmc-10.00~svn33778/xbmc/RenderSystemGLES.cpp 2010-06-17 03:07:30.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/RenderSystemGLES.cpp 2010-09-30 15:28:45.000000000 +0000 @@ -42,22 +42,6 @@ CRenderSystemGLES::~CRenderSystemGLES() { - DestroyRenderSystem(); - CLog::Log(LOGDEBUG, "GUI Shader - Destroying Shader : %p", m_pGUIshader); - - if (m_pGUIshader) - { - for (int i = 0; i < SM_ESHADERCOUNT; i++) - { - if (m_pGUIshader[i]) - { - m_pGUIshader[i]->Free(); - delete m_pGUIshader[i]; - m_pGUIshader[i] = NULL; - } - } - delete[] m_pGUIshader; - } } bool CRenderSystemGLES::InitRenderSystem() @@ -137,6 +121,22 @@ bool CRenderSystemGLES::DestroyRenderSystem() { + CLog::Log(LOGDEBUG, "GUI Shader - Destroying Shader : %p", m_pGUIshader); + + if (m_pGUIshader) + { + for (int i = 0; i < SM_ESHADERCOUNT; i++) + { + if (m_pGUIshader[i]) + { + m_pGUIshader[i]->Free(); + delete m_pGUIshader[i]; + m_pGUIshader[i] = NULL; + } + } + delete[] m_pGUIshader; + } + m_bRenderCreated = false; return true; diff -Nru xbmc-10.00~svn33778/xbmc/SortFileItem.cpp xbmc-10.00~svn34731/xbmc/SortFileItem.cpp --- xbmc-10.00~svn33778/xbmc/SortFileItem.cpp 2010-08-28 11:08:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/SortFileItem.cpp 2010-10-06 10:08:15.000000000 +0000 @@ -157,6 +157,15 @@ item->SetSortLabel(label); } +void SSortFileItem::ByDateAdded(CFileItemPtr &item) +{ + if (!item) return; + + CStdString label; + label.Format("%d", item->GetVideoInfoTag()->m_iFileId); + item->SetSortLabel(label); +} + void SSortFileItem::BySize(CFileItemPtr &item) { if (!item) return; diff -Nru xbmc-10.00~svn33778/xbmc/SortFileItem.h xbmc-10.00~svn34731/xbmc/SortFileItem.h --- xbmc-10.00~svn33778/xbmc/SortFileItem.h 2010-08-28 11:08:31.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/SortFileItem.h 2010-10-06 10:08:15.000000000 +0000 @@ -45,6 +45,7 @@ static void ByFile(CFileItemPtr &item); static void ByFullPath(CFileItemPtr &item); static void ByDate(CFileItemPtr &item); + static void ByDateAdded(CFileItemPtr &item); static void BySize(CFileItemPtr &item); static void ByDriveType(CFileItemPtr &item); static void BySongTitle(CFileItemPtr &item); @@ -98,6 +99,7 @@ SORT_METHOD_COUNTRY, SORT_METHOD_YEAR, SORT_METHOD_VIDEO_RATING, + SORT_METHOD_DATEADDED, SORT_METHOD_PROGRAM_COUNT, SORT_METHOD_PLAYLIST_ORDER, SORT_METHOD_EPISODE, diff -Nru xbmc-10.00~svn33778/xbmc/TextureCache.cpp xbmc-10.00~svn34731/xbmc/TextureCache.cpp --- xbmc-10.00~svn33778/xbmc/TextureCache.cpp 2010-09-03 07:02:54.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/TextureCache.cpp 2010-10-08 02:41:58.000000000 +0000 @@ -253,7 +253,7 @@ AddJob(new CDDSJob(GetCachedPath(originalFile))); return GetCachedPath(originalFile); } - return url; + return ""; } void CTextureCache::ClearCachedImage(const CStdString &url, bool deleteSource /*= false */) diff -Nru xbmc-10.00~svn33778/xbmc/UPnP.cpp xbmc-10.00~svn34731/xbmc/UPnP.cpp --- xbmc-10.00~svn33778/xbmc/UPnP.cpp 2010-09-04 14:27:16.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/UPnP.cpp 2010-10-08 19:24:18.000000000 +0000 @@ -542,7 +542,7 @@ resource.m_Size = item.m_dwSize; if (resource.m_Size == 0) { struct __stat64 info; - if(CFile::Stat((const char*)file_path, &info) >= 0 && info.st_size >= 0) + if(CFile::Stat((const char*)file_path, &info) == 0 && info.st_size >= 0) resource.m_Size = info.st_size; } if(resource.m_Size == 0) diff -Nru xbmc-10.00~svn33778/xbmc/Util.cpp xbmc-10.00~svn34731/xbmc/Util.cpp --- xbmc-10.00~svn33778/xbmc/Util.cpp 2010-09-03 18:33:19.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/Util.cpp 2010-09-29 12:08:17.000000000 +0000 @@ -90,6 +90,7 @@ #endif #include "WindowingFactory.h" #include "LocalizeStrings.h" +#include "utils/md5.h" #include "utils/TimeUtils.h" #include "utils/log.h" #include "Picture.h" @@ -1180,6 +1181,11 @@ return strFile.Left(8).Equals("videodb:"); } +bool CUtil::IsShoutCast(const CStdString& strFile) +{ + return strFile.Left(6).Equals("shout:"); +} + bool CUtil::IsLastFM(const CStdString& strFile) { return strFile.Left(7).Equals("lastfm:"); @@ -1307,6 +1313,29 @@ strURLData = strResult; } +CStdString CUtil::GetFileMD5(const CStdString& strPath) +{ + CFile file; + CStdString result; + if (file.Open(strPath)) + { + XBMC::XBMC_MD5 md5; + char temp[1024]; + int pos=0; + int read=1; + while (read > 0 && pos < file.GetLength()) + { + read = file.Read(temp,1024); + pos += read; + md5.append(temp,read); + } + md5.getDigest(result); + file.Close(); + } + + return result; +} + bool CUtil::GetDirectoryName(const CStdString& strFileName, CStdString& strDescription) { CStdString strFName = CUtil::GetFileName(strFileName); @@ -1945,6 +1974,21 @@ return ""; } +CStdString CUtil::GetNextPathname(const CStdString &path_template, int max) +{ + if (!path_template.Find("%04d")) + return ""; + + for (int i = 0; i <= max; i++) + { + CStdString name; + name.Format(path_template.c_str(), i); + if (!CFile::Exists(name)) + return name; + } + return ""; +} + void CUtil::Tokenize(const CStdString& path, vector& tokens, const string& delimiters) { // Tokenize ripped from http://www.linuxselfhelp.com/HOWTO/C++Programming-HOWTO-7.html diff -Nru xbmc-10.00~svn33778/xbmc/Util.h xbmc-10.00~svn34731/xbmc/Util.h --- xbmc-10.00~svn33778/xbmc/Util.h 2010-08-04 07:59:12.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/Util.h 2010-09-29 12:08:17.000000000 +0000 @@ -108,12 +108,19 @@ static bool IsLiveTV(const CStdString& strFile); static bool IsMusicDb(const CStdString& strFile); static bool IsVideoDb(const CStdString& strFile); + static bool IsShoutCast(const CStdString& strFile); static bool IsLastFM(const CStdString& strFile); static bool ExcludeFileOrFolder(const CStdString& strFileOrFolder, const CStdStringArray& regexps); static void GetFileAndProtocol(const CStdString& strURL, CStdString& strDir); static int GetDVDIfoTitle(const CStdString& strPathFile); static void URLDecode(CStdString& strURLData); static void URLEncode(CStdString& strURLData); + + /*! \brief retrieve MD5sum of a file + \param strPath - path to the file to MD5sum + \return md5 sum of the file + */ + static CStdString GetFileMD5(const CStdString& strPath); static bool GetDirectoryName(const CStdString& strFileName, CStdString& strDescription); static bool IsISO9660(const CStdString& strFile); static bool IsSmb(const CStdString& strFile); @@ -150,6 +157,7 @@ static void ThumbCacheClear(); static void PlayDVD(const CStdString& strProtocol="dvd"); static CStdString GetNextFilename(const CStdString &fn_template, int max); + static CStdString GetNextPathname(const CStdString &path_template, int max); static void TakeScreenshot(); static void TakeScreenshot(const CStdString &filename, bool sync); static void Tokenize(const CStdString& path, std::vector& tokens, const std::string& delimiters); diff -Nru xbmc-10.00~svn33778/xbmc/utils/AlarmClock.cpp xbmc-10.00~svn34731/xbmc/utils/AlarmClock.cpp --- xbmc-10.00~svn33778/xbmc/utils/AlarmClock.cpp 2010-03-02 13:30:57.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/AlarmClock.cpp 2010-09-23 09:38:52.000000000 +0000 @@ -37,12 +37,12 @@ { } -void CAlarmClock::start(const CStdString& strName, float n_secs, const CStdString& strCommand, bool bSilent /* false */) +void CAlarmClock::Start(const CStdString& strName, float n_secs, const CStdString& strCommand, bool bSilent /* false */) { // make lower case so that lookups are case-insensitive CStdString lowerName(strName); lowerName.ToLower(); - stop(lowerName); + Stop(lowerName); SAlarmClockEvent event; event.m_fSecs = n_secs; event.m_strCommand = strCommand; @@ -79,7 +79,7 @@ CLog::Log(LOGDEBUG,"started alarm with name: %s",lowerName.c_str()); } -void CAlarmClock::stop(const CStdString& strName) +void CAlarmClock::Stop(const CStdString& strName, bool bSilent /* false */) { CSingleLock lock(m_events); @@ -108,7 +108,10 @@ strMessage.Format(strStarted.c_str(),static_cast(remaining)/60,static_cast(remaining)%60); } if (iter->second.m_strCommand.IsEmpty() || iter->second.m_fSecs > iter->second.watch.GetElapsedSeconds()) - g_application.m_guiDialogKaiToast.QueueNotification(CGUIDialogKaiToast::Info, strAlarmClock, strMessage); + { + if(!bSilent) + g_application.m_guiDialogKaiToast.QueueNotification(CGUIDialogKaiToast::Info, strAlarmClock, strMessage); + } else g_application.getApplicationMessenger().ExecBuiltIn(iter->second.m_strCommand); @@ -126,7 +129,7 @@ for (map::iterator iter=m_event.begin();iter != m_event.end(); ++iter) if (iter->second.watch.GetElapsedSeconds() >= iter->second.m_fSecs) { - stop(iter->first); + Stop(iter->first); if ((iter = m_event.find(strLast)) == m_event.end()) break; } diff -Nru xbmc-10.00~svn33778/xbmc/utils/AlarmClock.h xbmc-10.00~svn34731/xbmc/utils/AlarmClock.h --- xbmc-10.00~svn33778/xbmc/utils/AlarmClock.h 2009-09-05 01:43:11.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/AlarmClock.h 2010-09-23 09:38:52.000000000 +0000 @@ -40,13 +40,13 @@ public: CAlarmClock(); ~CAlarmClock(); - void start(const CStdString& strName, float n_secs, const CStdString& strCommand, bool bSilent = false); - inline bool isRunning() const + void Start(const CStdString& strName, float n_secs, const CStdString& strCommand, bool bSilent = false); + inline bool IsRunning() const { return m_bIsRunning; } - inline bool hasAlarm(const CStdString& strName) + inline bool HasAlarm(const CStdString& strName) { // note: strName should be lower case only here // No point checking it at the moment due to it only being called @@ -66,7 +66,7 @@ return 0.f; } - void stop(const CStdString& strName); + void Stop(const CStdString& strName, bool bSilent = false); virtual void Process(); private: std::map m_event; diff -Nru xbmc-10.00~svn33778/xbmc/utils/Builtins.cpp xbmc-10.00~svn34731/xbmc/utils/Builtins.cpp --- xbmc-10.00~svn33778/xbmc/utils/Builtins.cpp 2010-08-15 15:54:52.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/Builtins.cpp 2010-09-30 10:09:44.000000000 +0000 @@ -183,6 +183,7 @@ { "Addon.Default.OpenSettings", true, "Open a settings dialog for the default addon of the given type" }, { "Addon.Default.Set", true, "Open a select dialog to allow choosing the default addon of the given type" }, { "Addon.OpenSettings", true, "Open a settings dialog for the addon of the given id" }, + { "UpdateAddonRepos", false, "Check add-on repositories for updates" }, { "ToggleDPMS", false, "Toggle DPMS mode manually"}, #if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE) { "LIRC.Stop", false, "Removes XBMC as LIRC client" }, @@ -262,11 +263,18 @@ { g_application.getApplicationMessenger().Minimize(); } - else if (execute.Equals("loadprofile") && g_settings.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE) + else if (execute.Equals("loadprofile")) { int index = g_settings.GetProfileIndex(parameter); - if (index >= 0) + bool prompt = (params.size() == 2 && params[1].Equals("prompt")); + bool bCanceled; + if (index >= 0 + && (g_settings.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE + || g_passwordManager.IsProfileLockUnlocked(index,bCanceled,prompt))) + { + CGUIWindowLoginScreen::LoadProfile(index); + } } else if (execute.Equals("mastermode")) { @@ -786,10 +794,10 @@ if (params.size() > 3 && params[3].CompareNoCase("true") == 0) silent = true; - if( g_alarmClock.isRunning() ) - g_alarmClock.stop(params[0]); + if( g_alarmClock.IsRunning() ) + g_alarmClock.Stop(params[0]); - g_alarmClock.start(params[0], seconds, params[1], silent); + g_alarmClock.Start(params[0], seconds, params[1], silent); } else if (execute.Equals("notification")) { @@ -804,7 +812,7 @@ } else if (execute.Equals("cancelalarm")) { - g_alarmClock.stop(parameter); + g_alarmClock.Stop(parameter); } else if (execute.Equals("playdvd")) { @@ -1327,6 +1335,10 @@ if (CAddonMgr::Get().GetAddon(params[0], addon)) CGUIDialogAddonSettings::ShowAndGetInput(addon); } + else if (execute.Equals("updateaddonrepos")) + { + CAddonMgr::Get().UpdateRepos(true); + } else if (execute.Equals("toggledpms")) { g_application.ToggleDPMS(true); diff -Nru xbmc-10.00~svn33778/xbmc/utils/CharsetConverter.cpp xbmc-10.00~svn34731/xbmc/utils/CharsetConverter.cpp --- xbmc-10.00~svn33778/xbmc/utils/CharsetConverter.cpp 2010-09-02 09:51:08.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/CharsetConverter.cpp 2010-09-23 07:42:02.000000000 +0000 @@ -27,6 +27,7 @@ #include "SingleLock.h" #include "log.h" +#include #include #ifdef __APPLE__ @@ -116,7 +117,7 @@ if (iconv_const(type, &src, &inBytes, &dst, &outBytes) == (size_t)-1) { - CLog::Log(LOGERROR, "%s failed", __FUNCTION__); + CLog::Log(LOGERROR, "%s failed from %s to %s, errno=%d", __FUNCTION__, strFromCharset.c_str(), strToCharset.c_str(), errno); strDest.ReleaseBuffer(); return false; } @@ -396,7 +397,7 @@ CStdString strEnc = enc; if (strEnc.Right(8) != "//IGNORE") strEnc.append("//IGNORE"); - convert(iconvString,sizeof(wchar_t),WCHAR_CHARSET,strEnc,strSource,strDest); + convert(iconvString,4,WCHAR_CHARSET,strEnc,strSource,strDest); iconv_close(iconvString); } @@ -405,7 +406,9 @@ { iconv_t iconvString; ICONV_PREPARE(iconvString); - convert(iconvString,sizeof(wchar_t),enc,"UTF-16LE//IGNORE",strSource,strDest); + CStdString strWchar = WCHAR_CHARSET; + strWchar.append("//IGNORE"); + convert(iconvString,sizeof(wchar_t),enc,strWchar,strSource,strDest); iconv_close(iconvString); } diff -Nru xbmc-10.00~svn33778/xbmc/utils/DbusServer.cpp xbmc-10.00~svn34731/xbmc/utils/DbusServer.cpp --- xbmc-10.00~svn33778/xbmc/utils/DbusServer.cpp 2010-01-08 23:47:11.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/DbusServer.cpp 2010-10-10 02:31:23.000000000 +0000 @@ -213,7 +213,7 @@ dbus_error_init( &error ); /* connect to the session bus */ - *conn = dbus_bus_get( DBUS_BUS_SESSION, &error ); + *conn = dbus_bus_get_private( DBUS_BUS_SESSION, &error ); if( !*conn ) { CLog::Log(LOGERROR, " DS: Failed to connect to the D-Bus session daemon: %s", error.message ); dbus_error_free( &error ); @@ -280,6 +280,7 @@ if (m_pThread && bWait) { m_pThread->WaitForThreadExit(2000); + dbus_connection_close(p_conn); dbus_connection_unref( p_conn ); delete m_pThread; m_pThread = NULL; diff -Nru xbmc-10.00~svn33778/xbmc/utils/Event.cpp xbmc-10.00~svn34731/xbmc/utils/Event.cpp --- xbmc-10.00~svn33778/xbmc/utils/Event.cpp 2010-01-08 23:47:11.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/Event.cpp 2010-10-10 13:01:06.000000000 +0000 @@ -107,7 +107,3 @@ return false; } -void CEvent::PulseEvent() -{ - ::PulseEvent(m_hEvent); -} diff -Nru xbmc-10.00~svn33778/xbmc/utils/Event.h xbmc-10.00~svn34731/xbmc/utils/Event.h --- xbmc-10.00~svn33778/xbmc/utils/Event.h 2009-12-02 00:04:11.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/Event.h 2010-10-10 13:01:06.000000000 +0000 @@ -41,7 +41,6 @@ class CEvent { public: - void PulseEvent(); bool WaitMSec(unsigned int milliSeconds); HANDLE GetHandle(); void Reset(); diff -Nru xbmc-10.00~svn33778/xbmc/utils/FileOperationJob.cpp xbmc-10.00~svn34731/xbmc/utils/FileOperationJob.cpp --- xbmc-10.00~svn33778/xbmc/utils/FileOperationJob.cpp 2010-05-19 01:39:22.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/FileOperationJob.cpp 2010-10-11 00:44:26.000000000 +0000 @@ -67,14 +67,11 @@ { int64_t time = 1; - if (action == ActionCopy || (action == ActionMove && !CanBeRenamed(strFileA, strFileB))) + if (action == ActionCopy || action == ActionReplace || (action == ActionMove && !CanBeRenamed(strFileA, strFileB))) { - CFile file; - if (file.Open(strFileA)) - { - time += file.GetLength(); - file.Close(); - } + struct __stat64 data; + if(CFile::Stat(strFileA, &data) == 0) + time += data.st_size; } fileOperations.push_back(CFileOperation(action, strFileA, strFileB, time)); @@ -97,7 +94,7 @@ CLog::Log(LOGDEBUG,"FileManager, processing folder: %s",strPath.c_str()); CFileItemList items; //m_rootDir.GetDirectory(strPath, items); - CDirectory::GetDirectory(strPath, items, "", false); + CDirectory::GetDirectory(strPath, items, "", false, false, DIR_CACHE_ONCE, true, false, true); for (int i = 0; i < items.Size(); i++) { CFileItemPtr pItem = items[i]; @@ -149,10 +146,16 @@ if (pItem->m_bIsFolder) { + // in ActionReplace mode all subdirectories will be removed by the below + // DoProcessFolder(ActionDelete) call as well, so ActionCopy is enough when + // processing those + FileAction subdirAction = (action == ActionReplace) ? ActionCopy : action; // create folder on dest. drive if (action != ActionDelete) DoProcessFile(ActionCreateFolder, strnewDestFile, "", fileOperations, totalTime); - if (!DoProcessFolder(action, pItem->m_strPath, strnewDestFile, fileOperations, totalTime)) + if (action == ActionReplace && CDirectory::Exists(strnewDestFile)) + DoProcessFolder(ActionDelete, strnewDestFile, "", fileOperations, totalTime); + if (!DoProcessFolder(subdirAction, pItem->m_strPath, strnewDestFile, fileOperations, totalTime)) return false; if (action == ActionDelete) DoProcessFile(ActionDeleteFolder, pItem->m_strPath, "", fileOperations, totalTime); @@ -184,6 +187,7 @@ switch (m_action) { case ActionCopy: + case ActionReplace: base->m_currentOperation = g_localizeStrings.Get(115); break; case ActionMove: @@ -209,6 +213,7 @@ switch (m_action) { case ActionCopy: + case ActionReplace: { CLog::Log(LOGDEBUG,"FileManager: copy %s->%s\n", m_strFileA.c_str(), m_strFileB.c_str()); diff -Nru xbmc-10.00~svn33778/xbmc/utils/FileOperationJob.h xbmc-10.00~svn34731/xbmc/utils/FileOperationJob.h --- xbmc-10.00~svn33778/xbmc/utils/FileOperationJob.h 2010-05-19 01:39:32.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/FileOperationJob.h 2010-10-10 19:52:21.000000000 +0000 @@ -33,6 +33,7 @@ ActionCopy = 1, ActionMove, ActionDelete, + ActionReplace, ///< Copy, emptying any existing destination directories first ActionCreateFolder, ActionDeleteFolder, }; diff -Nru xbmc-10.00~svn33778/xbmc/utils/GUIInfoManager.cpp xbmc-10.00~svn34731/xbmc/utils/GUIInfoManager.cpp --- xbmc-10.00~svn33778/xbmc/utils/GUIInfoManager.cpp 2010-09-13 15:39:17.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/GUIInfoManager.cpp 2010-09-23 09:38:52.000000000 +0000 @@ -2240,7 +2240,7 @@ bReturn = g_windowManager.IsWindowActive(m_stringParameters[info.GetData2()]); break; case SYSTEM_HAS_ALARM: - bReturn = g_alarmClock.hasAlarm(m_stringParameters[info.GetData1()]); + bReturn = g_alarmClock.HasAlarm(m_stringParameters[info.GetData1()]); break; case SYSTEM_GET_BOOL: bReturn = g_guiSettings.GetBool(m_stringParameters[info.GetData1()]); diff -Nru xbmc-10.00~svn33778/xbmc/utils/GUIInfoManager.h xbmc-10.00~svn34731/xbmc/utils/GUIInfoManager.h --- xbmc-10.00~svn33778/xbmc/utils/GUIInfoManager.h 2010-09-08 06:25:55.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/GUIInfoManager.h 2010-10-13 03:56:38.000000000 +0000 @@ -431,7 +431,7 @@ // Version string MUST NOT contain spaces. It is used // in the HTTP request user agent. -#define VERSION_STRING "10.0-beta2" +#define VERSION_STRING "10.0-beta3" #define LISTITEM_START 35000 #define LISTITEM_THUMB (LISTITEM_START) diff -Nru xbmc-10.00~svn33778/xbmc/utils/HTMLUtil.cpp xbmc-10.00~svn34731/xbmc/utils/HTMLUtil.cpp --- xbmc-10.00~svn33778/xbmc/utils/HTMLUtil.cpp 2010-09-02 09:40:05.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/HTMLUtil.cpp 2010-09-30 15:30:25.000000000 +0000 @@ -273,11 +273,15 @@ int iPos = 0; strStripped = strHTML; while (mappings[iPos].html) - strStripped.Replace(mappings[iPos++].html,CStdStringW(1, mappings[iPos].w)); + { + strStripped.Replace(mappings[iPos].html,CStdStringW(1, mappings[iPos].w)); + iPos++; + } iPos = strStripped.Find(L"&#"); while (iPos > 0 && iPos < (int)strStripped.size()-4) { + int iStart = iPos + 1; iPos += 2; CStdStringW num; int base = 10; @@ -300,7 +304,7 @@ num.Format(L"&#x%s;",num.c_str()); strStripped.Replace(num,CStdStringW(1,val)); - iPos = strStripped.Find(L"&#"); + iPos = strStripped.Find(L"&#", iStart); } } diff -Nru xbmc-10.00~svn33778/xbmc/utils/LabelFormatter.cpp xbmc-10.00~svn34731/xbmc/utils/LabelFormatter.cpp --- xbmc-10.00~svn33778/xbmc/utils/LabelFormatter.cpp 2010-07-10 22:39:24.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/LabelFormatter.cpp 2010-10-04 07:44:45.000000000 +0000 @@ -251,6 +251,7 @@ break; case 'K': value = item->m_strTitle; + break; case 'M': if (movie && movie->m_iEpisode > 0) value.Format("%i %s", movie->m_iEpisode,g_localizeStrings.Get(movie->m_iEpisode == 1 ? 20452 : 20453)); diff -Nru xbmc-10.00~svn33778/xbmc/utils/WebServer.cpp xbmc-10.00~svn34731/xbmc/utils/WebServer.cpp --- xbmc-10.00~svn33778/xbmc/utils/WebServer.cpp 2010-09-13 07:35:17.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/utils/WebServer.cpp 2010-10-13 02:55:49.000000000 +0000 @@ -133,8 +133,10 @@ } #endif - if (methodType == GET && strURL.Left(18).Equals("/xbmcCmds/xbmcHttp")) +#ifdef HAS_HTTPAPI + if ((methodType == GET || methodType == POST) && strURL.Left(18).Equals("/xbmcCmds/xbmcHttp")) return HttpApi(connection); +#endif if (strURL.Left(4).Equals("/vfs")) { diff -Nru xbmc-10.00~svn33778/xbmc/VideoDatabase.cpp xbmc-10.00~svn34731/xbmc/VideoDatabase.cpp --- xbmc-10.00~svn33778/xbmc/VideoDatabase.cpp 2010-09-03 07:01:17.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/VideoDatabase.cpp 2010-10-07 11:36:30.000000000 +0000 @@ -414,7 +414,8 @@ if (!m_pDS->query("select strPath,noUpdate from path" " where idPath in (select idPath from files join movie on movie.idFile=files.idFile)" " and idPath NOT in (select idPath from tvshowlinkpath)" - " and idPath NOT in (select idPath from files where strFileName like 'video_ts.ifo')" // dvdfolders get stacked to a single item in parent folder + " and idPath NOT in (select idPath from files where strFileName like 'video_ts.ifo')" // dvd folders get stacked to a single item in parent folder + " and idPath NOT in (select idPath from files where strFileName like 'index.bdmv')" // bluray folders get stacked to a single item in parent folder " and strPath NOT like 'multipath://%%'" " and strContent NOT in ('movies', 'tvshows', 'None')" // these have been added above " order by strPath")) @@ -3607,7 +3608,7 @@ if (g_settings.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser) { if (idContent == VIDEODB_CONTENT_MOVIES) - strSQL=PrepareSQL("select sets.idSet,sets.strSet,path.strPath,files.playCount from sets join setlinkmovie on sets.idSet=setlinkmovie.idSet join movie on setlinkmovie.idMovie=movie.idMovie join files on files.idFile=movie.idFile join path on path.idPath=files.idPath"); + strSQL=PrepareSQL("SELECT sets.idSet,sets.strSet,path.strPath,files.playCount FROM sets JOIN setlinkmovie ON sets.idSet=setlinkmovie.idSet JOIN (SELECT idSet, COUNT(1) AS c FROM setlinkmovie GROUP BY idSet HAVING c>1) s2 ON s2.idSet=sets.idSet JOIN movie ON setlinkmovie.idMovie=movie.idMovie JOIN files ON files.idFile=movie.idFile JOIN path ON path.idPath=files.idPath"); strSQL += where; } else @@ -3615,8 +3616,8 @@ CStdString group; if (idContent == VIDEODB_CONTENT_MOVIES) { - strSQL=PrepareSQL("select sets.idSet,sets.strSet,count(1),count(files.playCount) from sets join setlinkmovie on sets.idSet=setlinkmovie.idSet join movie on setlinkmovie.idMovie=movie.idMovie join files on files.idFile=movie.idFile "); - group = " group by sets.idSet"; + strSQL=PrepareSQL("SELECT sets.idSet,sets.strSet,COUNT(1) AS c,count(files.playCount) FROM sets JOIN setlinkmovie ON sets.idSet=setlinkmovie.idSet JOIN movie ON setlinkmovie.idMovie=movie.idMovie JOIN files ON files.idFile=movie.idFile "); + group = " GROUP BY sets.idSet HAVING c>1"; } strSQL += where; strSQL += group; @@ -4403,7 +4404,7 @@ if (where.size()) strSQL += where + PrepareSQL(" and movieview.idMovie NOT in (select idMovie from setlinkmovie)"); else - strSQL += PrepareSQL("where movieview.idMovie NOT in (select idMovie from setlinkmovie)"); + strSQL += PrepareSQL("WHERE movieview.idMovie NOT IN (SELECT idMovie FROM setlinkmovie s1 JOIN(SELECT idSet, COUNT(1) AS c FROM setlinkmovie GROUP BY idSet HAVING c>1) s2 ON s2.idSet=s1.idSet)"); } else strSQL += where; diff -Nru xbmc-10.00~svn33778/xbmc/VideoInfoScanner.cpp xbmc-10.00~svn34731/xbmc/VideoInfoScanner.cpp --- xbmc-10.00~svn33778/xbmc/VideoInfoScanner.cpp 2010-09-14 03:28:16.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/VideoInfoScanner.cpp 2010-09-23 06:14:42.000000000 +0000 @@ -779,6 +779,8 @@ return false; CStdString strLabel=item->m_strPath; + // URLDecode in case an episode is on a http/https/dav/davs:// source and URL-encoded like foo%201x01%20bar.avi + CUtil::URLDecode(strLabel); strLabel.MakeLower(); // CLog::Log(LOGDEBUG,"running expression %s on label %s",regexp.c_str(),strLabel.c_str()); int regexppos, regexp2pos; @@ -869,6 +871,8 @@ return false; CStdString strLabel=item->m_strPath; + // URLDecode in case an episode is on a http/https/dav/davs:// source and URL-encoded like foo%201x01%20bar.avi + CUtil::URLDecode(strLabel); strLabel.MakeLower(); // CLog::Log(LOGDEBUG,"running expression %s on label %s",regexp.c_str(),strLabel.c_str()); int regexppos; @@ -1213,13 +1217,10 @@ CUtil::GetDirectory(item->m_strPath, strPath); if (bGrabAny) - { // looking up by folder name - movie.nfo and mymovies.xml take priority + { // looking up by folder name - movie.nfo takes priority nfoFile = CUtil::AddFileToFolder(strPath, "movie.nfo"); if (CFile::Exists(nfoFile)) return nfoFile; - nfoFile = CUtil::AddFileToFolder(strPath, "mymovies.xml"); - if (CFile::Exists(nfoFile)) - return nfoFile; } // try looking for .nfo file for a stacked item diff -Nru xbmc-10.00~svn33778/xbmc/VideoInfoTag.cpp xbmc-10.00~svn34731/xbmc/VideoInfoTag.cpp --- xbmc-10.00~svn33778/xbmc/VideoInfoTag.cpp 2010-09-08 06:21:00.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/VideoInfoTag.cpp 2010-09-21 13:24:23.000000000 +0000 @@ -238,10 +238,7 @@ // reset our details if we aren't chained. if (!chained) Reset(); - if (CStdString("Title").Equals(movie->Value())) // mymovies.xml - ParseMyMovies(movie); - else - ParseNative(movie); + ParseNative(movie); return true; } @@ -561,136 +558,6 @@ } } -void CVideoInfoTag::ParseMyMovies(const TiXmlElement *movie) -{ - XMLUtils::GetString(movie, "LocalTitle", m_strTitle); - XMLUtils::GetString(movie, "OriginalTitle", m_strOriginalTitle); - XMLUtils::GetString(movie, "SortTitle", m_strSortTitle); - XMLUtils::GetFloat(movie, "Rating", m_fRating); - XMLUtils::GetString(movie, "IMDB", m_strIMDBNumber); - XMLUtils::GetInt(movie, "ProductionYear", m_iYear); - int runtime = 0; - XMLUtils::GetInt(movie, "RunningTime", runtime); - m_strRuntime.Format("%i:%02d", runtime/60, runtime%60); // convert from minutes to hh:mm - XMLUtils::GetString(movie, "TagLine", m_strTagLine); - XMLUtils::GetString(movie, "Description", m_strPlot); - if (m_strTagLine.IsEmpty()) - { - if (m_strPlot.find("\r\n") > 0) - m_strPlotOutline = m_strPlot.substr(0, m_strPlot.find("\r\n") - 1); - else - m_strPlotOutline = m_strPlot; - } - - // thumb - CStdString strTemp; - const TiXmlNode *node = movie->FirstChild("Covers"); - while (node) - { - const TiXmlNode *front = node->FirstChild("Front"); - if (front && front->FirstChild()) - { - strTemp = front->FirstChild()->Value(); - if (!strTemp.IsEmpty()) - m_strPictureURL.ParseString(strTemp); - } - node = node->NextSibling("Covers"); - } - // genres - node = movie->FirstChild("Genres"); - const TiXmlNode *genre = node ? node->FirstChildElement("Genre") : NULL; - while (genre) - { - if (genre && genre->FirstChild()) - { - strTemp = genre->FirstChild()->Value(); - if (m_strGenre.IsEmpty()) - m_strGenre = strTemp; - else - m_strGenre += g_advancedSettings.m_videoItemSeparator+strTemp; - } - genre = genre->NextSiblingElement("Genre"); - } - // countries - node = movie->FirstChild("Countries"); - const TiXmlNode *country = node ? node->FirstChildElement("Country") : NULL; - while (country) - { - if (country && country->FirstChild()) - { - strTemp = country->FirstChild()->Value(); - if (m_strCountry.IsEmpty()) - m_strCountry = strTemp; - else - m_strCountry += g_advancedSettings.m_videoItemSeparator+strTemp; - } - country = country->NextSibling("Countries"); - } - // MyMovies categories to genres - if (g_advancedSettings.m_bVideoLibraryMyMoviesCategoriesToGenres) - { - node = movie->FirstChild("Categories"); - const TiXmlNode *category = node ? node->FirstChildElement("Category") : NULL; - while (category) - { - if (category && category->FirstChild()) - { - strTemp = category->FirstChild()->Value(); - if (m_strGenre.IsEmpty()) - m_strGenre = strTemp; - else - m_strGenre += g_advancedSettings.m_videoItemSeparator+strTemp; - } - category = category->NextSiblingElement("Category"); - } - } - // studios - node = movie->FirstChild("Studios"); - while (node) - { - const TiXmlNode *studio = node->FirstChild("Studio"); - if (studio && studio->FirstChild()) - { - strTemp = studio->FirstChild()->Value(); - if (m_strStudio.IsEmpty()) - m_strStudio = strTemp; - else - m_strStudio += g_advancedSettings.m_videoItemSeparator+strTemp; - } - node = node->NextSibling("Studios"); - } - // persons - int personType = -1; - node = movie->FirstChild("Persons"); - const TiXmlElement *element = node ? node->FirstChildElement("Person") : NULL; - while (element) - { - element->Attribute("Type", &personType); - const TiXmlNode *person = element->FirstChild("Name"); - if (person && person->FirstChild()) - { - if (personType == 1) // actor - { - SActorInfo info; - info.strName = person->FirstChild()->Value(); - const TiXmlNode *roleNode = element->FirstChild("Role"); - if (roleNode && roleNode->FirstChild()) - info.strRole = roleNode->FirstChild()->Value(); - m_cast.push_back(info); - } - else if (personType == 2) // director - { - strTemp = person->FirstChild()->Value(); - if (m_strDirector.IsEmpty()) - m_strDirector = strTemp; - else - m_strDirector += g_advancedSettings.m_videoItemSeparator+strTemp; - } - } - element = element->NextSiblingElement("Person"); - } -} - bool CVideoInfoTag::HasStreamDetails() const { return m_streamDetails.HasItems(); diff -Nru xbmc-10.00~svn33778/xbmc/VideoInfoTag.h xbmc-10.00~svn34731/xbmc/VideoInfoTag.h --- xbmc-10.00~svn33778/xbmc/VideoInfoTag.h 2010-05-07 09:41:49.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/VideoInfoTag.h 2010-09-21 13:24:23.000000000 +0000 @@ -100,7 +100,6 @@ private: void ParseNative(const TiXmlElement* movie); - void ParseMyMovies(const TiXmlElement* movie); }; typedef std::vector VECMOVIES; diff -Nru xbmc-10.00~svn33778/xbmc/visualizations/XBMCProjectM/libprojectM/projectM.cpp xbmc-10.00~svn34731/xbmc/visualizations/XBMCProjectM/libprojectM/projectM.cpp --- xbmc-10.00~svn33778/xbmc/visualizations/XBMCProjectM/libprojectM/projectM.cpp 2010-06-05 20:04:19.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/visualizations/XBMCProjectM/libprojectM/projectM.cpp 2010-09-25 22:29:03.000000000 +0000 @@ -82,9 +82,12 @@ { #ifdef USE_THREADS + pthread_mutex_lock( &mutex ); running = false; pthread_cond_signal(&condition); + pthread_mutex_unlock( &mutex ); pthread_join(thread, NULL); + pthread_cond_destroy(&condition); pthread_mutex_destroy( &mutex ); #endif diff -Nru xbmc-10.00~svn33778/xbmc/win32/Win32PowerSyscall.cpp xbmc-10.00~svn34731/xbmc/win32/Win32PowerSyscall.cpp --- xbmc-10.00~svn33778/xbmc/win32/Win32PowerSyscall.cpp 2010-05-04 18:21:26.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/win32/Win32PowerSyscall.cpp 2010-09-26 16:17:59.000000000 +0000 @@ -37,13 +37,17 @@ } bool CWin32PowerSyscall::Suspend() { - CPowerSyscallWithoutEvents::Suspend(); + // On Vista+, we don't receive the PBT_APMSUSPEND message as we have fired the suspend mode + // Set the flag manually + CWin32PowerSyscall::SetOnSuspend(); return CWIN32Util::PowerManagement(POWERSTATE_SUSPEND); } bool CWin32PowerSyscall::Hibernate() { - CPowerSyscallWithoutEvents::Hibernate(); + // On Vista+, we don't receive the PBT_APMSUSPEND message as we have fired the suspend mode + // Set the flag manually + CWin32PowerSyscall::SetOnSuspend(); return CWIN32Util::PowerManagement(POWERSTATE_HIBERNATE); } diff -Nru xbmc-10.00~svn33778/xbmc/win32/Win32PowerSyscall.h xbmc-10.00~svn34731/xbmc/win32/Win32PowerSyscall.h --- xbmc-10.00~svn33778/xbmc/win32/Win32PowerSyscall.h 2010-05-04 18:21:26.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/win32/Win32PowerSyscall.h 2010-09-26 16:17:59.000000000 +0000 @@ -28,7 +28,7 @@ #define _WIN32_POWER_SYSCALL_H_ #include "IPowerSyscall.h" -class CWin32PowerSyscall : public CPowerSyscallWithoutEvents +class CWin32PowerSyscall : public IPowerSyscall { public: CWin32PowerSyscall(); diff -Nru xbmc-10.00~svn33778/xbmc/win32/WIN32XBPythonDll.cpp xbmc-10.00~svn34731/xbmc/win32/WIN32XBPythonDll.cpp --- xbmc-10.00~svn33778/xbmc/win32/WIN32XBPythonDll.cpp 2010-07-19 18:58:08.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/win32/WIN32XBPythonDll.cpp 2010-10-09 13:00:44.000000000 +0000 @@ -125,6 +125,7 @@ FUNCTION(PyThreadState_Get) FUNCTION4(PyRun_SimpleString) FUNCTION(PyEval_InitThreads) + FUNCTION(PyEval_ThreadsInitialized) FUNCTION(Py_Initialize) FUNCTION(Py_IsInitialized) FUNCTION(Py_Finalize) @@ -294,6 +295,7 @@ dll.ResolveExport(DLL_FUNCTION(PyThreadState_Get)) && dll.ResolveExport(DLL_FUNCTION(PyRun_SimpleString)) && dll.ResolveExport(DLL_FUNCTION(PyEval_InitThreads)) && + dll.ResolveExport(DLL_FUNCTION(PyEval_ThreadsInitialized)) && dll.ResolveExport(DLL_FUNCTION(Py_Initialize)) && dll.ResolveExport(DLL_FUNCTION(Py_IsInitialized)) && dll.ResolveExport(DLL_FUNCTION(Py_Finalize)) && diff -Nru xbmc-10.00~svn33778/xbmc/win32/WINFileSMB.cpp xbmc-10.00~svn34731/xbmc/win32/WINFileSMB.cpp --- xbmc-10.00~svn33778/xbmc/win32/WINFileSMB.cpp 2010-06-13 21:05:45.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/win32/WINFileSMB.cpp 2010-10-10 13:47:32.000000000 +0000 @@ -119,15 +119,23 @@ int CWINFileSMB::Stat(struct __stat64* buffer) { int fd; + HANDLE hFileDup; + if (0 == DuplicateHandle(GetCurrentProcess(), (HANDLE)m_hFile, GetCurrentProcess(), &hFileDup, 0, FALSE, DUPLICATE_SAME_ACCESS)) + { + CLog::Log(LOGERROR, __FUNCTION__" - DuplicateHandle()"); + return -1; + } - fd = _open_osfhandle((intptr_t)((HANDLE)m_hFile), 0); + fd = _open_osfhandle((intptr_t)((HANDLE)hFileDup), 0); if (fd == -1) { CLog::Log(LOGERROR, "CWINFileSMB Stat: fd == -1"); return -1; } - return _fstat64(fd, buffer); + int result = _fstat64(fd, buffer); + _close(fd); + return result; } int CWINFileSMB::Stat(const CURL& url, struct __stat64* buffer) diff -Nru xbmc-10.00~svn33778/xbmc/win32/XBMC_PC.rc xbmc-10.00~svn34731/xbmc/win32/XBMC_PC.rc --- xbmc-10.00~svn33778/xbmc/win32/XBMC_PC.rc 2010-09-08 06:25:55.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/win32/XBMC_PC.rc 2010-10-13 03:56:38.000000000 +0000 @@ -71,12 +71,12 @@ BEGIN VALUE "CompanyName", "Team XBMC" VALUE "FileDescription", "XBMC" - VALUE "FileVersion", "10.0-beta2" + VALUE "FileVersion", "10.0-beta3" VALUE "InternalName", "XBMC.exe" VALUE "LegalCopyright", "Copyright (c) Team XBMC. All rights reserved." VALUE "OriginalFilename", "XBMC.exe" VALUE "ProductName", "XBMC for Windows" - VALUE "ProductVersion", "10.0-beta2" + VALUE "ProductVersion", "10.0-beta3" END END BLOCK "VarFileInfo" diff -Nru xbmc-10.00~svn33778/xbmc/WinEventsWin32.cpp xbmc-10.00~svn34731/xbmc/WinEventsWin32.cpp --- xbmc-10.00~svn33778/xbmc/WinEventsWin32.cpp 2010-08-26 05:44:13.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/WinEventsWin32.cpp 2010-09-14 15:08:59.000000000 +0000 @@ -461,9 +461,11 @@ switch (GET_APPCOMMAND_LPARAM(lParam)) { case APPCOMMAND_MEDIA_PLAY: - case APPCOMMAND_MEDIA_PLAY_PAUSE: newEvent.appcommand.action = ACTION_PLAYER_PLAY; break; + case APPCOMMAND_MEDIA_PLAY_PAUSE: + newEvent.appcommand.action = ACTION_PLAYER_PLAYPAUSE; + break; case APPCOMMAND_MEDIA_PAUSE: newEvent.appcommand.action = ACTION_PAUSE; break; diff -Nru xbmc-10.00~svn33778/xbmc/WinSystemEGL.cpp xbmc-10.00~svn34731/xbmc/WinSystemEGL.cpp --- xbmc-10.00~svn33778/xbmc/WinSystemEGL.cpp 2010-06-16 21:30:26.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/WinSystemEGL.cpp 2010-09-30 15:28:45.000000000 +0000 @@ -91,7 +91,6 @@ CWinSystemEGL::~CWinSystemEGL() { - DestroyWindowSystem(); } bool CWinSystemEGL::InitWindowSystem() @@ -124,24 +123,42 @@ bool CWinSystemEGL::DestroyWindowSystem() { if (m_eglContext) + { eglDestroyContext(m_eglDisplay, m_eglContext); + m_eglContext = 0; + } if (m_eglSurface) + { eglDestroySurface(m_eglDisplay, m_eglSurface); + m_eglSurface = NULL; + } // Needed??? if (m_eglWindow) + { XDestroyWindow(m_dpy, m_eglWindow); + m_eglWindow = 0; + } // Needed??? if (m_wmWindow) + { XDestroyWindow(m_dpy, m_wmWindow); + m_wmWindow = 0; + } if (m_eglDisplay) + { eglTerminate(m_eglDisplay); + m_eglDisplay = 0; + } if (m_dpy) + { XCloseDisplay(m_dpy); + m_dpy = NULL; + } return true; } diff -Nru xbmc-10.00~svn33778/xbmc/WinSystemX11.cpp xbmc-10.00~svn34731/xbmc/WinSystemX11.cpp --- xbmc-10.00~svn33778/xbmc/WinSystemX11.cpp 2010-04-09 22:32:58.000000000 +0000 +++ xbmc-10.00~svn34731/xbmc/WinSystemX11.cpp 2010-10-10 18:44:56.000000000 +0000 @@ -44,7 +44,6 @@ CWinSystemX11::~CWinSystemX11() { - DestroyWindowSystem(); } bool CWinSystemX11::InitWindowSystem() @@ -73,11 +72,21 @@ bool CWinSystemX11::DestroyWindowSystem() { +#if defined(HAS_XRANDR) + //restore videomode on exit + if (m_bFullScreen) + g_xrandr.RestoreState(); +#endif + if (m_dpy) { if (m_glContext) glXDestroyContext(m_dpy, m_glContext); + + m_glContext = 0; + XCloseDisplay(m_dpy); + m_dpy = NULL; } // m_SDLSurface is free()'d by SDL_Quit(). @@ -87,6 +96,22 @@ bool CWinSystemX11::CreateNewWindow(const CStdString& name, bool fullScreen, RESOLUTION_INFO& res, PHANDLE_EVENT_FUNC userFunction) { + RESOLUTION_INFO& desktop = g_settings.m_ResInfo[RES_DESKTOP]; + + if (fullScreen && + (res.iWidth != desktop.iWidth || res.iHeight != desktop.iHeight || + res.fRefreshRate != desktop.fRefreshRate || res.iScreen != desktop.iScreen)) + { + //on the first call to SDL_SetVideoMode, SDL stores the current displaymode + //SDL restores the displaymode on SDL_QUIT(), if we change the displaymode + //before the first call to SDL_SetVideoMode, SDL changes the displaymode back + //to the wrong mode on exit + + CLog::Log(LOGINFO, "CWinSystemX11::CreateNewWindow initializing to desktop resolution first"); + if (!SetFullScreen(true, desktop, false)) + return false; + } + if(!SetFullScreen(fullScreen, res, false)) return false; @@ -136,21 +161,18 @@ m_bFullScreen = fullScreen; #if defined(HAS_XRANDR) - + XOutput out; + XMode mode; + out.name = res.strOutput; + mode.w = res.iWidth; + mode.h = res.iHeight; + mode.hz = res.fRefreshRate; + mode.id = res.strId; + if(m_bFullScreen) - { - XOutput out; - XMode mode; - out.name = res.strOutput; - mode.w = res.iWidth; - mode.h = res.iHeight; - mode.hz = res.fRefreshRate; - mode.id = res.strId; g_xrandr.SetMode(out, mode); - } else g_xrandr.RestoreState(); - #endif int options = SDL_OPENGL; @@ -165,6 +187,7 @@ CLog::Log(LOGERROR, "CWinSystemX11::SetFullScreen SDL_OPENGL not set, SDL_GetError:%s", SDL_GetError()); RefreshGlxContext(); + return true; } @@ -185,14 +208,14 @@ g_settings.m_ResInfo[RES_DESKTOP].strId = mode.id; g_settings.m_ResInfo[RES_DESKTOP].strOutput = out.name; } -#else + else +#endif { int x11screen = DefaultScreen(m_dpy); int w = DisplayWidth(m_dpy, x11screen); int h = DisplayHeight(m_dpy, x11screen); UpdateDesktopResolution(g_settings.m_ResInfo[RES_DESKTOP], 0, w, h, 0.0); } -#endif #if defined(HAS_XRANDR) @@ -230,6 +253,7 @@ res.strId = mode.id; res.iSubtitles = (int)(0.95*mode.h); res.fRefreshRate = mode.hz; + res.bFullScreen = true; if ((float)mode.w / (float)mode.h >= 1.59) res.dwFlags = D3DPRESENTFLAG_WIDESCREEN; diff -Nru xbmc-10.00~svn33778/XBMC.xcodeproj/project.pbxproj xbmc-10.00~svn34731/XBMC.xcodeproj/project.pbxproj --- xbmc-10.00~svn33778/XBMC.xcodeproj/project.pbxproj 2010-09-13 07:36:38.000000000 +0000 +++ xbmc-10.00~svn34731/XBMC.xcodeproj/project.pbxproj 2010-10-05 00:40:06.000000000 +0000 @@ -469,7 +469,6 @@ E38E1FC60D25F9FD00618676 /* CDDAcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15E60D25F9FA00618676 /* CDDAcodec.cpp */; }; E38E1FC70D25F9FD00618676 /* CodecFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15E80D25F9FA00618676 /* CodecFactory.cpp */; }; E38E1FCB0D25F9FD00618676 /* FLACcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E160A0D25F9FA00618676 /* FLACcodec.cpp */; }; - E38E1FCC0D25F9FD00618676 /* GYMCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E160C0D25F9FA00618676 /* GYMCodec.cpp */; }; E38E1FCF0D25F9FD00618676 /* MP3codec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16130D25F9FA00618676 /* MP3codec.cpp */; }; E38E1FD10D25F9FD00618676 /* NSFCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E161B0D25F9FA00618676 /* NSFCodec.cpp */; }; E38E1FD20D25F9FD00618676 /* OGGcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16230D25F9FA00618676 /* OGGcodec.cpp */; }; @@ -777,7 +776,6 @@ E38E22850D25F9FE00618676 /* MusicInfoTagLoaderCDDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D9D0D25F9FD00618676 /* MusicInfoTagLoaderCDDA.cpp */; }; E38E22860D25F9FE00618676 /* MusicInfoTagLoaderDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D9F0D25F9FD00618676 /* MusicInfoTagLoaderDatabase.cpp */; }; E38E22880D25F9FE00618676 /* MusicInfoTagLoaderFlac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DA30D25F9FD00618676 /* MusicInfoTagLoaderFlac.cpp */; }; - E38E22890D25F9FE00618676 /* MusicInfoTagLoaderGYM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DA50D25F9FD00618676 /* MusicInfoTagLoaderGYM.cpp */; }; E38E228A0D25F9FE00618676 /* MusicInfoTagLoaderMod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DA70D25F9FD00618676 /* MusicInfoTagLoaderMod.cpp */; }; E38E228B0D25F9FE00618676 /* MusicInfoTagLoaderMP3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DA90D25F9FD00618676 /* MusicInfoTagLoaderMP3.cpp */; }; E38E228C0D25F9FE00618676 /* MusicInfoTagLoaderMP4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DAB0D25F9FD00618676 /* MusicInfoTagLoaderMP4.cpp */; }; @@ -1183,7 +1181,6 @@ F5A1C91E0F6B06CF00A96ABD /* CDDAcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15E60D25F9FA00618676 /* CDDAcodec.cpp */; }; F5A1C91F0F6B06CF00A96ABD /* CodecFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E15E80D25F9FA00618676 /* CodecFactory.cpp */; }; F5A1C9200F6B06CF00A96ABD /* FLACcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E160A0D25F9FA00618676 /* FLACcodec.cpp */; }; - F5A1C9210F6B06CF00A96ABD /* GYMCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E160C0D25F9FA00618676 /* GYMCodec.cpp */; }; F5A1C9230F6B06CF00A96ABD /* MP3codec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16130D25F9FA00618676 /* MP3codec.cpp */; }; F5A1C9250F6B06CF00A96ABD /* NSFCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E161B0D25F9FA00618676 /* NSFCodec.cpp */; }; F5A1C9260F6B06CF00A96ABD /* OGGcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16230D25F9FA00618676 /* OGGcodec.cpp */; }; @@ -1491,7 +1488,6 @@ F5A1CA8B0F6B06CF00A96ABD /* MusicInfoTagLoaderCDDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D9D0D25F9FD00618676 /* MusicInfoTagLoaderCDDA.cpp */; }; F5A1CA8C0F6B06CF00A96ABD /* MusicInfoTagLoaderDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D9F0D25F9FD00618676 /* MusicInfoTagLoaderDatabase.cpp */; }; F5A1CA8E0F6B06CF00A96ABD /* MusicInfoTagLoaderFlac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DA30D25F9FD00618676 /* MusicInfoTagLoaderFlac.cpp */; }; - F5A1CA8F0F6B06CF00A96ABD /* MusicInfoTagLoaderGYM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DA50D25F9FD00618676 /* MusicInfoTagLoaderGYM.cpp */; }; F5A1CA900F6B06CF00A96ABD /* MusicInfoTagLoaderMod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DA70D25F9FD00618676 /* MusicInfoTagLoaderMod.cpp */; }; F5A1CA910F6B06CF00A96ABD /* MusicInfoTagLoaderMP3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DA90D25F9FD00618676 /* MusicInfoTagLoaderMP3.cpp */; }; F5A1CA920F6B06CF00A96ABD /* MusicInfoTagLoaderMP4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DAB0D25F9FD00618676 /* MusicInfoTagLoaderMP4.cpp */; }; @@ -2589,7 +2585,6 @@ E38E15EE0D25F9FA00618676 /* DllAc3codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllAc3codec.h; sourceTree = ""; }; E38E15EF0D25F9FA00618676 /* DllAdpcm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllAdpcm.h; sourceTree = ""; }; E38E15F20D25F9FA00618676 /* DllDCACodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllDCACodec.h; sourceTree = ""; }; - E38E15F40D25F9FA00618676 /* DllGensApu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllGensApu.h; sourceTree = ""; }; E38E15F50D25F9FA00618676 /* DllLibFlac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibFlac.h; sourceTree = ""; }; E38E15FA0D25F9FA00618676 /* DllNosefart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllNosefart.h; sourceTree = ""; }; E38E15FB0D25F9FA00618676 /* DllSidplay2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllSidplay2.h; sourceTree = ""; }; @@ -2600,8 +2595,6 @@ E38E16000D25F9FA00618676 /* DllWMA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllWMA.h; sourceTree = ""; }; E38E160A0D25F9FA00618676 /* FLACcodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FLACcodec.cpp; sourceTree = ""; }; E38E160B0D25F9FA00618676 /* FLACcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLACcodec.h; sourceTree = ""; }; - E38E160C0D25F9FA00618676 /* GYMCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GYMCodec.cpp; sourceTree = ""; }; - E38E160D0D25F9FA00618676 /* GYMCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GYMCodec.h; sourceTree = ""; }; E38E160E0D25F9FA00618676 /* ICodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICodec.h; sourceTree = ""; }; E38E16130D25F9FA00618676 /* MP3codec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MP3codec.cpp; sourceTree = ""; }; E38E16140D25F9FA00618676 /* MP3codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MP3codec.h; sourceTree = ""; }; @@ -3327,8 +3320,6 @@ E38E1DA00D25F9FD00618676 /* MusicInfoTagLoaderDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicInfoTagLoaderDatabase.h; sourceTree = ""; }; E38E1DA30D25F9FD00618676 /* MusicInfoTagLoaderFlac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicInfoTagLoaderFlac.cpp; sourceTree = ""; }; E38E1DA40D25F9FD00618676 /* MusicInfoTagLoaderFlac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicInfoTagLoaderFlac.h; sourceTree = ""; }; - E38E1DA50D25F9FD00618676 /* MusicInfoTagLoaderGYM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicInfoTagLoaderGYM.cpp; sourceTree = ""; }; - E38E1DA60D25F9FD00618676 /* MusicInfoTagLoaderGYM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicInfoTagLoaderGYM.h; sourceTree = ""; }; E38E1DA70D25F9FD00618676 /* MusicInfoTagLoaderMod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicInfoTagLoaderMod.cpp; sourceTree = ""; }; E38E1DA80D25F9FD00618676 /* MusicInfoTagLoaderMod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicInfoTagLoaderMod.h; sourceTree = ""; }; E38E1DA90D25F9FD00618676 /* MusicInfoTagLoaderMP3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicInfoTagLoaderMP3.cpp; sourceTree = ""; }; @@ -4763,8 +4754,6 @@ E38E1DA00D25F9FD00618676 /* MusicInfoTagLoaderDatabase.h */, E38E1DA30D25F9FD00618676 /* MusicInfoTagLoaderFlac.cpp */, E38E1DA40D25F9FD00618676 /* MusicInfoTagLoaderFlac.h */, - E38E1DA50D25F9FD00618676 /* MusicInfoTagLoaderGYM.cpp */, - E38E1DA60D25F9FD00618676 /* MusicInfoTagLoaderGYM.h */, F584E0FA0F25427500DB26A5 /* MusicInfoTagLoaderMidi.h */, F584E0FB0F25427500DB26A5 /* MusicInfoTagLoaderMidi.cpp */, E38E1DA70D25F9FD00618676 /* MusicInfoTagLoaderMod.cpp */, @@ -5345,7 +5334,6 @@ E38E15EE0D25F9FA00618676 /* DllAc3codec.h */, E38E15EF0D25F9FA00618676 /* DllAdpcm.h */, E38E15F20D25F9FA00618676 /* DllDCACodec.h */, - E38E15F40D25F9FA00618676 /* DllGensApu.h */, E38E15F50D25F9FA00618676 /* DllLibFlac.h */, E38E15FA0D25F9FA00618676 /* DllNosefart.h */, E38E15FB0D25F9FA00618676 /* DllSidplay2.h */, @@ -5362,8 +5350,6 @@ F5F8E1D80E427E8000A8E96F /* VGMCodec.h */, E38E160A0D25F9FA00618676 /* FLACcodec.cpp */, E38E160B0D25F9FA00618676 /* FLACcodec.h */, - E38E160C0D25F9FA00618676 /* GYMCodec.cpp */, - E38E160D0D25F9FA00618676 /* GYMCodec.h */, E38E160E0D25F9FA00618676 /* ICodec.h */, F5DC8800110A46C700EE1B15 /* ModplugCodec.cpp */, F5DC87FF110A46C700EE1B15 /* ModplugCodec.h */, @@ -7161,7 +7147,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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/$TARGET_NAME/Contents/\"\n\n# start clean so we don't keep old dylibs\nrm -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/*\"\n\n# Copy all of XBMC's dynamic dependencies and rename their locations to inside the Framework\nfor a in $(otool -L \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS/XBMC\" | grep opt | awk ' { print $1 } ') ; do \n\techo \"Processing $a\"\n\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\tinstall_name_tool -change \"$a\" @executable_path/../Frameworks/$(basename $a) \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS/XBMC\"\ndone\n\nREWIND=\"1\"\n# Copy all the *osx.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/system -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the system/python/Lib/*.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/system/python/Lib -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system/python/Lib/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the addon/*.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/addons -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/\"*dylib ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\n"; + 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/$TARGET_NAME/Contents/\"\n\n# start clean so we don't keep old dylibs\nrm -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/*\"\n\n# Copy all of XBMC's dynamic dependencies and rename their locations to inside the Framework\nfor a in $(otool -L \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS/XBMC\" | grep opt | awk ' { print $1 } ') ; do \n\techo \"Processing $a\"\n\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\tinstall_name_tool -change \"$a\" @executable_path/../Frameworks/$(basename $a) \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS/XBMC\"\ndone\n\nREWIND=\"1\"\n# Copy all the *osx.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/system -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the system/python/Lib/*.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/system/python/Lib -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system/python/Lib/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the addon/*.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/addons -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the addon/*.xbs dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/addons -name \"*.xbs\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/\"*dylib ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\n"; }; 81B8FC150E7D927A00354E2E /* update version info */ = { isa = PBXShellScriptBuildPhase; @@ -7204,7 +7190,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Force TARGET_NAME on ppc (do not use XBMC_ppc.app)\nTARGET_NAME=XBMC.app\nmkdir -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/$TARGET_NAME/Contents/\"\n\n# start clean so we don't keep old dylibs\nrm -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/*\"\n\n# Copy all of XBMC's dynamic dependencies and rename their locations to inside the Framework\nfor a in $(otool -L \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS/XBMC\" | grep opt | awk ' { print $1 } ') ; do \n\techo \"Processing $a\"\n\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\tinstall_name_tool -change \"$a\" @executable_path/../Frameworks/$(basename $a) \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS/XBMC\"\ndone\n\nREWIND=\"1\"\n# Copy all the *osx.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/system -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the system/python/Lib/*.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/system/python/Lib -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system/python/Lib/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the addon/*.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/addons -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/\"*dylib ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\n"; + shellScript = "# Force TARGET_NAME on ppc (do not use XBMC_ppc.app)\nTARGET_NAME=XBMC.app\nmkdir -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/$TARGET_NAME/Contents/\"\n\n# start clean so we don't keep old dylibs\nrm -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/*\"\n\n# Copy all of XBMC's dynamic dependencies and rename their locations to inside the Framework\nfor a in $(otool -L \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS/XBMC\" | grep opt | awk ' { print $1 } ') ; do \n\techo \"Processing $a\"\n\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\tinstall_name_tool -change \"$a\" @executable_path/../Frameworks/$(basename $a) \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/MacOS/XBMC\"\ndone\n\nREWIND=\"1\"\n# Copy all the *osx.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/system -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the system/python/Lib/*.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/system/python/Lib -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system/python/Lib/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the addon/*.so dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/addons -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the addon/*.xbs dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_BUILD_DIR/$TARGET_NAME\"/Contents/Resources/XBMC/addons -name \"*.xbs\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\n\nREWIND=\"1\"\n# Copy all the dynamic dependencies and rename their locations to inside the Framework\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/\"*dylib ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep opt | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks\"\n\t\t\t\tchmod u+w \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"@executable_path/../Frameworks/$(basename $a)\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Frameworks/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n\n"; }; F5A1CBE00F6B0B4700A96ABD /* update version info */ = { isa = PBXShellScriptBuildPhase; @@ -7393,7 +7379,6 @@ E38E1FC60D25F9FD00618676 /* CDDAcodec.cpp in Sources */, E38E1FC70D25F9FD00618676 /* CodecFactory.cpp in Sources */, E38E1FCB0D25F9FD00618676 /* FLACcodec.cpp in Sources */, - E38E1FCC0D25F9FD00618676 /* GYMCodec.cpp in Sources */, E38E1FCF0D25F9FD00618676 /* MP3codec.cpp in Sources */, E38E1FD10D25F9FD00618676 /* NSFCodec.cpp in Sources */, E38E1FD20D25F9FD00618676 /* OGGcodec.cpp in Sources */, @@ -7701,7 +7686,6 @@ E38E22850D25F9FE00618676 /* MusicInfoTagLoaderCDDA.cpp in Sources */, E38E22860D25F9FE00618676 /* MusicInfoTagLoaderDatabase.cpp in Sources */, E38E22880D25F9FE00618676 /* MusicInfoTagLoaderFlac.cpp in Sources */, - E38E22890D25F9FE00618676 /* MusicInfoTagLoaderGYM.cpp in Sources */, E38E228A0D25F9FE00618676 /* MusicInfoTagLoaderMod.cpp in Sources */, E38E228B0D25F9FE00618676 /* MusicInfoTagLoaderMP3.cpp in Sources */, E38E228C0D25F9FE00618676 /* MusicInfoTagLoaderMP4.cpp in Sources */, @@ -8264,7 +8248,6 @@ F5A1C91E0F6B06CF00A96ABD /* CDDAcodec.cpp in Sources */, F5A1C91F0F6B06CF00A96ABD /* CodecFactory.cpp in Sources */, F5A1C9200F6B06CF00A96ABD /* FLACcodec.cpp in Sources */, - F5A1C9210F6B06CF00A96ABD /* GYMCodec.cpp in Sources */, F5A1C9230F6B06CF00A96ABD /* MP3codec.cpp in Sources */, F5A1C9250F6B06CF00A96ABD /* NSFCodec.cpp in Sources */, F5A1C9260F6B06CF00A96ABD /* OGGcodec.cpp in Sources */, @@ -8572,7 +8555,6 @@ F5A1CA8B0F6B06CF00A96ABD /* MusicInfoTagLoaderCDDA.cpp in Sources */, F5A1CA8C0F6B06CF00A96ABD /* MusicInfoTagLoaderDatabase.cpp in Sources */, F5A1CA8E0F6B06CF00A96ABD /* MusicInfoTagLoaderFlac.cpp in Sources */, - F5A1CA8F0F6B06CF00A96ABD /* MusicInfoTagLoaderGYM.cpp in Sources */, F5A1CA900F6B06CF00A96ABD /* MusicInfoTagLoaderMod.cpp in Sources */, F5A1CA910F6B06CF00A96ABD /* MusicInfoTagLoaderMP3.cpp in Sources */, F5A1CA920F6B06CF00A96ABD /* MusicInfoTagLoaderMP4.cpp in Sources */,