June 2009 - rpmfusion-commits

rpms/mythtv-themes/devel myththemes-0.21-svnfixes.patch,1.2,1.3

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv-themes/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv1343 Added Files: myththemes-0.21-svnfixes.patch Log Message: oops, forgot to re-add patch myththemes-0.21-svnfixes.patch: Index: myththemes-0.21-svnfixes.patch =================================================================== RCS file: myththemes-0.21-svnfixes.patch diff -N myththemes-0.21-svnfixes.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ myththemes-0.21-svnfixes.patch 4 Jun 2009 14:32:03 -0000 1.3 @@ -0,0 +1,64 @@ +Index: myththemes/MythCenter/ui.xml +=================================================================== +--- myththemes/MythCenter/ui.xml (revision 16468) ++++ myththemes/MythCenter/ui.xml (working copy) +@@ -1872,7 +1872,7 @@ + <fcnfont name="active" function="selected"></fcnfont> + <fcnfont name="enabled_state_0_font" function="enabled_state_0"></fcnfont> + <columnpadding>1</columnpadding> +- <column number="1" width="745" context="-1"></column> ++ <column number="1" width="715" context="-1"></column> + <items>8</items> + <image function="selectionbar" filename="rk-selectbar.png" location="-8,3"></image> + <image function="uparrow" filename="uparrow.png" location="755,15"></image> +Index: myththemes/myththemes.pro +=================================================================== +--- myththemes/myththemes.pro (revision 16468) ++++ myththemes/myththemes.pro (working copy) +@@ -8,6 +8,7 @@ + CONFIG -= moc qt + + !macx:QMAKE_COPY_DIR = sh ./cpsvndir ++win32:QMAKE_INSTALL_DIR = sh ./cpsvndir + + themes.path = $${PREFIX}/share/mythtv/themes/ + themes.files = Iulius Iulius-OSD Minimalist-wide Titivillus Titivillus-OSD isthmus MythCenter MythCenter-wide Gray-OSD Retro Retro-OSD +Index: myththemes/Retro/ui.xml +=================================================================== +--- myththemes/Retro/ui.xml (revision 16468) ++++ myththemes/Retro/ui.xml (working copy) +@@ -1872,7 +1872,7 @@ + <fcnfont name="active" function="selected"></fcnfont> + <fcnfont name="enabled_state_0_font" function="enabled_state_0"></fcnfont> + <columnpadding>1</columnpadding> +- <column number="1" width="745" context="-1"></column> ++ <column number="1" width="715" context="-1"></column> + <items>8</items> + <image function="selectionbar" filename="rk-selectbar.png" location="-8,3"></image> + <image function="uparrow" filename="uparrow.png" location="755,15"></image> +Index: myththemes/Titivillus/ui.xml +=================================================================== +--- myththemes/Titivillus/ui.xml (revision 16468) ++++ myththemes/Titivillus/ui.xml (working copy) +@@ -1619,7 +1619,7 @@ + <fcnfont name="list-selected" function="selected"></fcnfont> + <fcnfont name="enabled_state_0_font" function="enabled_state_0"></fcnfont> + <columnpadding>1</columnpadding> +- <column number="1" width="745" context="-1"></column> ++ <column number="1" width="715" context="-1"></column> + <items>8</items> + <image function="selectionbar" filename="conflict/tit-cr-selectbar.png" location="-10,-5"></image> + <image function="uparrow" filename="shared/up_arrow.png" location="755,15"></image> +Index: myththemes/Iulius/ui.xml +=================================================================== +--- myththemes/Iulius/ui.xml (revision 16468) ++++ myththemes/Iulius/ui.xml (working copy) +@@ -1869,7 +1869,7 @@ + <fcnfont name="active" function="selected"></fcnfont> + <fcnfont name="enabled_state_0_font" function="enabled_state_0"></fcnfont> + <columnpadding>1</columnpadding> +- <column number="1" width="745" context="-1"></column> ++ <column number="1" width="715" context="-1"></column> + <items>8</items> + <image function="selectionbar" filename="rk-selectbar.png" location="-8,3"></image> + <image function="uparrow" filename="uparrow.png" location="755,15"></image>

15 years, 5 months

1
0
0 / 0

rpms/mythtv/F-11 mythtv.spec,1.35,1.36 sources,1.17,1.18

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv4279 Modified Files: mythtv.spec sources Log Message: * Thu Jun 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20668 - Update to pre-0.22 svn trunk revision 20668 This build should head for f11 updates-testing... Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-11/mythtv.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- mythtv.spec 18 May 2009 02:39:32 -0000 1.35 +++ mythtv.spec 4 Jun 2009 04:34:11 -0000 1.36 @@ -60,7 +60,7 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r20586 +%define _svnrev r20668 %define branch trunk # @@ -1466,6 +1466,9 @@ ################################################################################ %changelog +* Thu Jun 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20668 +- Update to pre-0.22 svn trunk revision 20668 + * Sun May 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20586 - Update to pre-0.22 svn trunk revision 20586 - Fix upgrade path for people that have mythphone installed (rfbz#596) Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/F-11/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 18 May 2009 02:39:32 -0000 1.17 +++ sources 4 Jun 2009 04:34:11 -0000 1.18 @@ -1,4 +1,4 @@ be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png -3b4fe8951562a25a8f8ff7f268ae18f1 mythtv-0.22.tar.bz2 -a4928864b9726819e28b75e018270fc1 mythplugins-0.22.tar.bz2 +4c485ae9f5238c3beed9ee80f7ab4cd6 mythplugins-0.22.tar.bz2 +5c484b6e40ca6ffc08be5491655faf2e mythtv-0.22.tar.bz2

15 years, 5 months

1
0
0 / 0

rpms/mythtv-themes/devel mythtv-themes.spec, 1.13, 1.14 sources, 1.9, 1.10

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv-themes/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv3613 Modified Files: mythtv-themes.spec sources Log Message: * Thu Jun 04 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-4 - Rebuild 0.21 build for f11 release repo, back to 0.22-svn in f11 updates-testing and rawhide soonish... Index: mythtv-themes.spec =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/devel/mythtv-themes.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mythtv-themes.spec 5 May 2009 06:29:49 -0000 1.13 +++ mythtv-themes.spec 4 Jun 2009 04:23:02 -0000 1.14 @@ -1,85 +1,33 @@ -# -# Specfile for building MythTV RPMs from a subversion checkout. -# -# by: Chris Petersen <rpm(a)forevermore.net> -# Jarod Wilson <jarod(a)wilsonet.com> -# -# Modified/Extended from the great (non-svn based) work of: -# Axel Thimm <Axel.Thimm(a)ATrpms.net> -# and others; see changelog at bottom for details. -# -# The latest version of this file can be found at: -# -# http://www.mythtv.org/wiki/index.php/Mythtv-themes-svn-rpmbuild.spec -# - -# The vendor name we should attribute the aforementioned entries to -%define desktop_vendor RPMFusion - -# SVN Revision number and branch ID -%define _svnrev r20488 -%define branch trunk - -# -# Basic descriptive tags for this package: -# -Name: mythtv-themes -Summary: Additional themes for mythtv's frontend -URL: http://www.mythtv.org/ -Group: Applications/Multimedia -License: GPLv2 - -# Version/Release info -Version: 0.22 -%if "%{branch}" == "trunk" -Release: 0.3.svn.%{_svnrev}%{?dist} -%else -Release: 1%{?dist} -%endif - -################################################################################ - -# Tarballs created from svn "themes" and "myththemes" directories -# Hopefully these will merge before 0.22 is released. -Source0: http://www.mythtv.org/mc/myththemes-%{version}.tar.bz2 -Source1: themes-%{version}.tar.bz2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -# no mythtv in RPM Fusion's ppc64 repo, hence ExcludeArch this package on ppc64 -# to have broken deps: -ExcludeArch: ppc64 - -################################################################################ - -BuildRequires: libmyth-devel = %{version} -BuildRequires: qt4-devel - -# Themes do require a frontend -Requires: mythtv-frontend - -# And obselete a bunch of packages from when themes were packaged individually -Obsoletes: mythtv-theme-MythCenter -Obsoletes: mythtv-theme-Retro -Obsoletes: mythtv-theme-Titivillus -Obsoletes: mythtv-theme-isthmus - -################################################################################ +Name: mythtv-themes +Version: 0.21 +Release: 4 +Summary: Additional User Interface themes for MythTV +Group: Applications/Multimedia +License: GPLv2 +URL: http://www.mythtv.org/ +Source0: http://www.mythtv.org/mc/myththemes-%{version}.tar.bz2 +# created from svn rev 17859: +# http://svn.mythtv.org/var/lib/svn/branches/release-0-21-fixes/themes +Source1: themes-%{version}.tar.bz2 +# Upstream url dead, extracted from mythbuntu packages +Source2: glass-wide-20071107.tar.gz +Patch0: myththemes-0.21-svnfixes.patch +BuildRequires: libmyth-devel = %{version} +Requires: mythtv-themes = %{version} +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv-docs package for more information. -This package contains additional themes for the mythtv user interface. - -################################################################################ +This package contains themes for the mythtv user interface. %prep -%setup -q -c -a 1 - -################################################################################ +%setup -q -c -a 1 -a 2 +cd myththemes-%{version} +%patch0 -p1 +cd .. %build cd myththemes-%{version} @@ -90,8 +38,6 @@ %configure cd .. -################################################################################ - %install rm -rf %{buildroot} @@ -103,54 +49,18 @@ make install INSTALL_ROOT=%{buildroot} cd .. -################################################################################ +cp -rp glass-wide %{buildroot}%{_datadir}/mythtv/themes/ %clean rm -rf %{buildroot} -################################################################################ - %files %defattr(-,root,root,-) %{_datadir}/mythtv/themes/* %changelog -* Tue May 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.22-0.3.svn.r20488 -- excludearch ppc64 to fix broken deps in RPM Fusions ppc64 repo - -* Mon May 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20488 -- Update to pre-0.22 svn trunk, rev 20488 - -* Fri Apr 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20448 -- Update to pre-0.22 svn trunk, rev 20448 - -* Tue Apr 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20317 -- Update to pre-0.22 svn trunk, rev 20317 - -* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.22-0.2.svn.r20196 -- rebuild for new F11 features - -* Thu Mar 12 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20196 -- Update to pre-0.22 svn trunk, rev 20196 - -* Wed Mar 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20107 -- Update to pre-0.22 svn trunk, rev 20107 - -* Mon Mar 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20089 -- Update to pre-0.22 svn trunk, rev 20089 - -* Sat Jan 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19811 -- Update to pre-0.22 svn trunk, rev 19811 - -* Wed Dec 31 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19506 -- Update to pre-0.22 svn trunk, rev 19506 - -* Wed Dec 17 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390 -- Build svn trunk themes to go with svn trunk mythtv, rev 19390 -- Drop glass-wide - -* Sat Nov 01 2008 Chris Petersen <rpm(a)forevermore.net> 0.22-0.1.svn -- Clean and standardize package to match mythtv-svn spec +* Thu Jun 04 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-4 +- Rebuild * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.21-3 - rebuild @@ -162,4 +72,3 @@ * Sun Mar 09 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-1 - Initial package - Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 5 May 2009 03:13:31 -0000 1.9 +++ sources 4 Jun 2009 04:23:02 -0000 1.10 @@ -1,2 +1,3 @@ -06ecab7d3e43264bf7357ddbd8bf0bcf myththemes-0.22.tar.bz2 -01b3fe563c40a14d85431a1594557193 themes-0.22.tar.bz2 +7cdec1649d3a94a8dbf96d129421cdac glass-wide-20071107.tar.gz +9a569ab5561f348fdbf82cdc46a1df9b myththemes-0.21.tar.bz2 +8a036cbbb8cf29c5512931e1f6f5445f themes-0.21.tar.bz2

15 years, 5 months

1
0
0 / 0

rpms/mythtv/devel mythplugins-0.21-svnfixes.patch, 1.6, 1.7 mythtv-0.21-svnfixes.patch, 1.7, 1.8 mythtv.spec, 1.35, 1.36 sources, 1.17, 1.18

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv2723 Modified Files: mythtv.spec sources Added Files: mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch Log Message: * Wed Jun 03 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-19 - Update to release-0-21-fixes patches (r20668) Okay, so actually... This is a roll-back to the 0.21 release of mythtv for the F11 release repo, then I'll start up 0.22-svn builds again as F11 updates-testing updates. Hope 0.22 gets released sooner than later... mythplugins-0.21-svnfixes.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 mythplugins-0.21-svnfixes.patch Index: mythplugins-0.21-svnfixes.patch =================================================================== RCS file: mythplugins-0.21-svnfixes.patch diff -N mythplugins-0.21-svnfixes.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mythplugins-0.21-svnfixes.patch 4 Jun 2009 04:09:34 -0000 1.7 @@ -0,0 +1,15856 @@ +Index: mythplugins/mythweb/INSTALL +=================================================================== +--- mythplugins/mythweb/INSTALL (revision 16468) ++++ mythplugins/mythweb/INSTALL (working copy) +@@ -2,7 +2,7 @@ + requirements and instructions for MythWeb. Please see README for other + information. + +-February 16, 2008 ++October 26, 2008 + + ======== + Contents +@@ -18,6 +18,7 @@ + 5.0 Apache + 5.1 Apache Config + 6.0 Lighttpd ++7.0 PHP + + ======= + Summary +@@ -195,6 +196,10 @@ + mod_deflate + mod_headers + ++In Suse 10.3 and above, you'll need to add "rewrite" in the file ++/etc/sysconfig/apache2 on the "APACHE_MODULES" line if it's not already ++there. ++ + ================= + 5.1 Apache Config + ================= +@@ -245,3 +250,25 @@ + + Sorry, no documentation here yet... + ++======= ++7.0 PHP ++======= ++ ++PHP tries to determine the system's local timezone settings automatically ++but may not be successful on every distribution. To ensure that PHP uses ++the correct timezone, edit php.ini and configure the date.timezone variable ++to your local timezone. ++ ++For example, to set the PHP timezone to Europe/London: ++ ++ vim /etc/php.ini ++ ++add/uncomment the date.timezone variable: ++ ++ date.timezone = Europe/London ++ ++and then restart Apache (exact commands depend on distribution): ++ ++ /etc/init.d/apache2 stop ++ /etc/init.d/apache2 start ++ + +Property changes on: mythplugins/mythweb/INSTALL +___________________________________________________________________ +Modified: svn:keywords + - Date Revision Author HeadURL + + Id Date Revision Author HeadURL + +Index: mythplugins/mythweb/modules/music/stream.php +=================================================================== +--- mythplugins/mythweb/modules/music/stream.php (revision 16468) ++++ mythplugins/mythweb/modules/music/stream.php (working copy) +@@ -76,8 +76,11 @@ + $mime = 'audio/mpeg'; + break; + case 'ogg': +- $mine = 'application/ogg'; ++ $mime = 'application/ogg'; + break; ++ case 'm4a': ++ $mime = 'audio/mp4a-latm'; ++ break; + default: + $mime = 'application/octet-stream'; + } +Index: mythplugins/mythweb/modules/music/mp3act_functions.php +=================================================================== +--- mythplugins/mythweb/modules/music/mp3act_functions.php (revision 16468) ++++ mythplugins/mythweb/modules/music/mp3act_functions.php (working copy) +@@ -334,13 +334,15 @@ + $length = $row[1]; + + // Attempt to find some album art. +- $query='SELECT ms.filename, ms.album_id, md.path, ma.artist_name, ma.artist_id, ms.directory_id ++ $query='SELECT ms.filename, ms.album_id, md.path, ma.artist_name, ma.artist_id, ms.directory_id, mal.album_name + FROM music_songs AS ms + LEFT JOIN music_directories AS md + ON ms.directory_id=md.directory_id + LEFT JOIN music_artists AS ma + ON ms.artist_id=ma.artist_id +- WHERE album_id='.$sql_itemid.' ++ LEFT JOIN music_albums AS mal ++ ON ms.album_id=mal.album_id ++ WHERE ms.album_id='.$sql_itemid.' + LIMIT 1'; + $result = mysql_query($query); + if (!$result) +Index: mythplugins/mythweb/modules/_shared/lang/German.cat +=================================================================== +--- mythplugins/mythweb/modules/_shared/lang/German.cat (revision 16468) ++++ mythplugins/mythweb/modules/_shared/lang/German.cat (working copy) +@@ -2,7 +2,7 @@ + Action + \b(?:\w*action|adven|\w*abenteuer) + "Adult" +- Erwachsene ++ Erotik + \b(?:adult|erot) + "Animals" + Tiere +Index: mythplugins/mythweb/modules/_shared/lang/German.lang +=================================================================== +--- mythplugins/mythweb/modules/_shared/lang/German.lang (revision 16468) ++++ mythplugins/mythweb/modules/_shared/lang/German.lang (working copy) +@@ -2,10 +2,13 @@ + " at " + um + "# Tracks" ++ # Lieder + "$1 B" + $1 B + "$1 day" ++ $1 Tag + "$1 days" ++ $1 Tage + "$1 episode" + $1 Folge + "$1 episodes" +@@ -17,6 +20,7 @@ + "$1 hrs" + $1 Std. + "$1 is not responding." ++ $1 antwortet nicht + "$1 KB" + $1 kB + "$1 MB" +@@ -26,7 +30,9 @@ + "$1 mins" + $1 Min. + "$1 month" ++ $1 Monat + "$1 months" ++ $1 Monate + "$1 programs, using $2 ($3) out of $4 ($5 free)." + $1 Aufnahmen, belegen $2 ($3) von $4. + "$1 recording" +@@ -34,6 +40,7 @@ + "$1 recordings" + $1 Aufnahmen + "$1 requests pending." ++ $1 Anfragen zu bearbeiten + "$1 Search" + $1 Suche + "$1 TB" +@@ -41,35 +48,51 @@ + "$1 to $2" + $1 bis $2 + "$1 wasted" ++ $1 verschwendet + "$1 year" ++ $1 Jahr + "$1 years" ++ $1 Jahre + "%s Song (%s)" ++ %s Lied (%s) + "%s Songs" ++ %s Lieder + "%s Songs (%s)" ++ %s Lieder (%s) + "°C" + "°F" + "Aborted" ++ abgebrochen + "Aborting" ++ breche ab + "Action" + Aktion + "Activate" + Aktivieren + "Active Screens" + "Add" ++ Hinzufügen + "Add Album to Current Playlist" ++ zur Wiedergabelsite hinzufügen + "Add Mix" ++ Mix hinzufügen [...15463 lines suppressed...] + <item> + <title>G4TV Street Fury Video Podcast</title> +- <url>http://www.g4tv.com/streetfury/podcasts/11/Street_Fury_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/streetfury/podcasts/11/Street_Fury_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV The Daily Feed Video Podcast</title> +- <url>http://www.g4tv.com/thefeed/podcasts/19/The_Daily_Feed_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/thefeed/podcasts/19/The_Daily_Feed_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV The Daily Nut</title> +- <url>http://www.g4tv.com/dailynut/podcasts/15/The_Daily_Nut.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/dailynut/podcasts/15/The_Daily_Nut.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV The Man Show Video Podcast</title> +- <url>http://www.g4tv.com/themanshow/podcasts/14/The_Man_Show_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/themanshow/podcasts/14/The_Man_Show_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV X-Play Daily Video Podcast</title> +- <url>http://www.g4tv.com/xplay/podcasts/6/XPlay_Daily_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/xplay/podcasts/6/XPlay_Daily_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + </category> +@@ -639,7 +639,7 @@ + + <item> + <title>Scotsman.com International News</title> +- <url>http://news.scotsman.com/international.cfm?format=rss</url> ++ <url>http://news.scotsman.com/getFeed.aspx?Format=rss&sectionid=7000</url> + <ico>http://www.scotsman.com/favicon.ico</ico> + </item> + +@@ -725,85 +725,55 @@ + </item> + + <item> +- <title>Digital Spy - Broadcasting</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsbroadcast.xml</url> ++ <title>Digital Spy - Media Headlines</title> ++ <url>http://www.digitalspy.co.uk/rss/zones/gb/media.xml</url> + </item> + + <item> +- <title>Digital Spy - Cable</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dscable.xml</url> ++ <title>Digital Spy - Big Brother</title> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/bigbrother.xml</url> + </item> + + <item> + <title>Digital Spy - Cult</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dscult.xml</url> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/cult.xml</url> + </item> + + <item> +- <title>Digital Spy - Entertainment Headlines</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dseznews.xml</url> +- </item> +- +- <item> +- <title>Digital Spy - Gaydar</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsgaydar.xml</url> +- </item> +- +- <item> +- <title>Digital Spy - Headlines</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsukstd.xml</url> +- </item> +- +- <item> +- <title>Digital Spy - Media Headlines</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsmznews.xml</url> +- </item> +- +- <item> + <title>Digital Spy - Movies</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsfilm.xml</url> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/movies.xml</url> + </item> + + <item> +- <title>Digital Spy - Programming</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsprogramming.xml</url> ++ <title>Digital Spy - Music</title> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/music.xml</url> + </item> + + <item> +- <title>Digital Spy - Radio</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsradio.xml</url> ++ <title>Digital Spy - Reality</title> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/realitytv.xml</url> + </item> + + <item> +- <title>Digital Spy - Reality TV</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsreality.xml</url> ++ <title>Digital Spy - Showbiz</title> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/showbiz.xml</url> + </item> + + <item> +- <title>Digital Spy - Satellite</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dssatellite.xml</url> ++ <title>Digital Spy - Soaps</title> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/soaps.xml</url> + </item> + + <item> +- <title>Digital Spy - Showbiz</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsshowbiz.xml</url> +- </item> +- +- <item> + <title>Digital Spy - Television</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dstv.xml</url> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/tv.xml</url> + </item> + + <item> +- <title>Digital Spy - Terrestrial</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsterrestrial.xml</url> ++ <title>Digital Spy - US TV</title> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/ustv.xml</url> + </item> + +- <item> +- <title>Digital Spy - US Television</title> +- <url>http://syndication.digitalspy.co.uk/xmlcache/dsustv.xml</url> +- </item> +- + </category> + + <category name="MythTV"> +@@ -840,7 +810,7 @@ + + <item> + <title>MythTV - Wiki Recent Changes</title> +- <url>http://www.mythtv.org/wiki/index.php?title=Special:Recentchanges&feed...</url> ++ <url>http://www.mythtv.org/wiki?title=Special:RecentChanges&feed=rss</url> + </item> + + </category> +@@ -1019,7 +989,7 @@ + + <item> + <title>Scotsman.com Opinion</title> +- <url>http://news.scotsman.com/opinion.cfm?format=rss</url> ++ <url>http://news.scotsman.com/getFeed.aspx?Format=rss&sectionid=7074</url> + <ico>http://www.scotsman.com/favicon.ico</ico> + </item> + +@@ -1115,18 +1085,25 @@ + + <item> + <title>Helsingin Sanomat (FI)</title> +- <url>http://siirto.helsinginsanomat.fi/aukio/HS-Tuoreet-RSS.xml</url> ++ <url>http://www.hs.fi/uutiset/rss/</url> ++ <ico>http://www.hs.fi/static/hs/img/favicon.ico</ico> + </item> + + <item> ++ <title>YLE (FI)</title> ++ <url>http://www.yle.fi/uutiset/rss/paauutiset.xml</url> ++ <ico>http://www.yle.fi/favicon.ico</ico> ++ </item> ++ ++ <item> + <title>Scotsman.com Headlines</title> +- <url>http://news.scotsman.com/index.cfm?format=rss</url> ++ <url>http://news.scotsman.com/getFeed.aspx?Format=rss&sectionid=4068</url> + <ico>http://www.scotsman.com/favicon.ico</ico> + </item> + + <item> + <title>Scotsman.com UK News</title> +- <url>http://news.scotsman.com/uk.cfm?format=rss</url> ++ <url>http://news.scotsman.com/getFeed.aspx?Format=rss&sectionid=7071</url> + <ico>http://www.scotsman.com/favicon.ico</ico> + </item> + mythtv-0.21-svnfixes.patch: View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 mythtv-0.21-svnfixes.patch Index: mythtv-0.21-svnfixes.patch =================================================================== RCS file: mythtv-0.21-svnfixes.patch diff -N mythtv-0.21-svnfixes.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mythtv-0.21-svnfixes.patch 4 Jun 2009 04:09:35 -0000 1.8 @@ -0,0 +1,47631 @@ +Index: mythtv/i18n/mythfrontend_nb.ts +=================================================================== +--- mythtv/i18n/mythfrontend_nb.ts (revision 16468) ++++ mythtv/i18n/mythfrontend_nb.ts (working copy) +@@ -151,7 +151,7 @@ + </message> + <message> + <source>Use channel scanner to find channels for this input.</source> +- <translation>Bruk kanalsøkeren for å finne kanaler fro denne inndatakilden.</translation> ++ <translation>Bruk kanalsøkeren for å finne kanaler for denne inndatakilden.</translation> + </message> + <message> + <source>This uses the listings data source to provide the channels for this input.</source> +@@ -391,7 +391,7 @@ + </message> + <message> + <source>Anytime on a specific day of the week</source> +- <translation>Nårr som helst på en bestemt ukedag</translation> ++ <translation>Når som helst på en bestemt ukedag</translation> + </message> + <message> + <source>Only on weekdays (Monday through Friday)</source> +@@ -1165,7 +1165,7 @@ + </message> + <message> + <source>The connection to the master backend server has gone away for some reason.. Is it running?</source> +- <translation>Tilkoblingen til hovedtjeneren har av en eller anenn grunn forsvunnet. Kjører den?</translation> ++ <translation>Tilkoblingen til hovedtjeneren har av en eller annen grunn forsvunnet. Kjører den?</translation> + </message> + <message> + <source>There are also other clients using this database. They should be shut down first.</source> +@@ -1216,7 +1216,7 @@ + <source>The theme you are using is missing the 'file_browser_background' element. + + Returning to the previous menu.</source> +- <translation>Temaet som brukes mangler elementet «file_borwsser_background». ++ <translation>Temaet som brukes mangler elementet «file_browser_background». + + Går tilbake til forrige meny.</translation> + </message> +@@ -1224,7 +1224,7 @@ + <source>The theme you are using is missing the 'file_browser' element. + + Returning to the previous menu.</source> +- <translation>Temaet som brukes mangler elementet «file_borwser». ++ <translation>Temaet som brukes mangler elementet «file_browser». + + Går tilbake til forrige meny.</translation> + </message> +@@ -1559,7 +1559,7 @@ + </message> + <message> + <source>Commercials are flagged</source> +- <translation>Reklamer blir markert</translation> ++ <translation>Reklamer er markert</translation> + </message> + <message> + <source>An editing cutlist is present</source> +@@ -1949,7 +1949,7 @@ + </message> + <message> + <source>Reverse Time</source> +- <translation>Omvendt kronoligisk rekkefølge</translation> ++ <translation>Omvendt kronologisk rekkefølge</translation> + </message> + <message> + <source>Sort by Title</source> +@@ -2388,7 +2388,7 @@ + </message> + <message> + <source>If this frontend's host name changes often, check this box and provide a network-unique name to identify it. If unchecked, the frontend machine's local host name will be used to save preferences in the database.</source> +- <translation>Hvis klientens vertsnavn enders ofte, kryss av denne boksen og oppgi et unikt nettverksnavn for å identifisere den. Er dette ikke avkrysset, vil klientens lokale vertsnavn bli brukt for å lagre innstillinger i databasen.</translation> ++ <translation>Hvis klientens vertsnavn endres ofte, kryss av denne boksen og oppgi et unikt nettverksnavn for å identifisere den. Er dette ikke avkrysset, vil klientens lokale vertsnavn bli brukt for å lagre innstillinger i databasen.</translation> + </message> + <message> + <source>Custom identifier</source> +@@ -3163,7 +3163,7 @@ + </message> + <message> + <source>This showing will be recorded.</source> +- <translation>Denne sendingen vil bil tatt opp.</translation> ++ <translation>Denne sendingen vil bli tatt opp.</translation> + </message> + <message> + <source>This showing is being recorded.</source> +@@ -3183,7 +3183,7 @@ + </message> + <message> + <source>This showing was not recorded because </source> +- <translation>Denne sendingen vil ikke bli tatt opp fordi </translation> ++ <translation>Denne sendingen ble ikke tatt opp fordi </translation> + </message> + <message> + <source>it was manually set to not record.</source> +@@ -3818,7 +3818,7 @@ + </message> + <message> + <source>Match duplicates using subtitle</source> +- <translation>Finn duplisering ved hejlp av undertittel</translation> ++ <translation>Finn duplisering ved hjelp av undertittel</translation> + </message> + <message> + <source>Match duplicates using description</source> +@@ -3850,7 +3850,7 @@ + </message> + <message> + <source>Allow auto expire</source> +- <translation>Tillatt automatisk utløing</translation> ++ <translation>Tillat automatisk utløping</translation> + </message> + <message> + <source>Don't allow auto expire</source> +@@ -3866,11 +3866,11 @@ + </message> + <message> + <source>Delete oldest if this would exceed the max episodes</source> +- <translation>Slett den eldste hvis denne overstiger tillate episoder</translation> ++ <translation>Slett den eldste hvis denne overstiger antall tillatte episoder</translation> + </message> + <message> + <source>Don't record if this would exceed the max episodes</source> +- <translation>Ikke ta opp hvis denne overstiger tillate episoder</translation> ++ <translation>Ikke ta opp hvis denne overstiger antall tillatte episoder</translation> + </message> + <message> + <source>No episode limit</source> +@@ -3956,7 +3956,7 @@ + <source>You MUST run 'mythfilldatabase --manual the first time, + instead of just 'mythfilldatabase'. + Your grabber does not provide channel numbers, so you have to set them manually.</source> +- <translation>Første gangen MÅ «mythfilldatabase --manual» kjøres i stedet for bare «mythfilldatabase». Henteren tildeler ikke kanalnumbre, så disse må angis manuelt.</translation> ++ <translation>Første gangen MÅ «mythfilldatabase --manual» kjøres i stedet for bare «mythfilldatabase». Henteren tildeler ikke kanalnummer, så disse må angis manuelt.</translation> + </message> + <message> + <source>Video source setup</source> +@@ -4242,7 +4242,7 @@ + </message> + <message> + <source>Enable this setting if MythTV is playing "crackly" audio and you are using hardware encoding. This setting will have no effect on MPEG-4 or RTJPEG video. MythTV will keep extra audio data in its internal buffers to workaround this bug.</source> +- <translation>Slå på denne innstillingen hvis MythTV spiller hakkete lyd og det brukes maskinvarekoding. Innstillingen har ingen effekt på MPEG-4- eller RTJPEG-video. Hakkingen fjernes ved at MythTV beholde ekstra lyddata i dets interne hurtigminne.</translation> ++ <translation>Slå på denne innstillingen hvis MythTV spiller hakkete lyd og det brukes maskinvarekoding. Innstillingen har ingen effekt på MPEG-4- eller RTJPEG-video. Hakkingen fjernes ved at MythTV beholder ekstra lyddata i dets interne hurtigminne.</translation> + </message> + <message> + <source>PIP Video Location</source> +@@ -4410,7 +4410,7 @@ + </message> + <message> + <source>New Recording Free Disk Space Threshold (in Megabytes)</source> +- <translation>MInimum ledig diskplass for å ta opp (i MB)</translation> ++ <translation type="unfinished">Minimum ledig diskplass for å ta opp (i MB)</translation> + </message> + <message> + <source>MythTV will stop scheduling new recordings on a backend when its free disk space falls below this value.</source> +@@ -4418,7 +4418,7 @@ + </message> + <message> + <source>Time to record before start of show (in seconds)</source> +- <translation>TId å ta opp før programstart (i sekunder)</translation> ++ <translation type="unfinished">Tid å ta opp før programstart (i sekunder)</translation> + </message> + <message> + <source>This global setting allows the recorder to start before the scheduled start time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source> +@@ -4430,7 +4430,7 @@ + </message> + <message> + <source>This global setting allows the recorder to record beyond the scheduled end time. It does not affect the scheduler. It is ignored when two shows have been scheduled without enough time in between.</source> +- <translation>Denne globale innstillingen tillater opptakeren å ta opp etter den planlagte sluttiden. Dette påvirker ikke planlaggeren, og ignoreres når to opptak er planlagt uten nok tid mellom dem.</translation> ++ <translation>Denne globale innstillingen tillater opptakeren å ta opp etter den planlagte sluttiden. Dette påvirker ikke planleggeren, og ignoreres når to opptak er planlagt uten nok tid mellom dem.</translation> + </message> + <message> + <source>List Newest Recording First</source> +@@ -4470,7 +4470,7 @@ + </message> + <message> + <source>If enabled, pressing the sticky rewind key in fast forward mode switches to rewind mode, and vice versa. If disabled, it will decrease the current speed or switch to play mode if the speed can't be decreased further.</source> +- <translation>Hvis på vil et trykk på den treige spole tilbake-knappen i framoverspillingsmodues bytte til bakoverspoling, og omvendt. Hvis av vil den nevnte handlingen senke farten eller bytte til avspillingsmodues hvis farten ikke kan reduseres mer.</translation> ++ <translation>Hvis på vil et trykk på den treige spole tilbake-knappen i framoverspillingsmodus bytte til bakoverspoling, og omvendt. Hvis av vil den nevnte handlingen senke farten eller bytte til avspillingsmodus hvis farten ikke kan reduseres mer.</translation> + </message> + <message> + <source>Menu theme</source> +@@ -4578,7 +4578,7 @@ + </message> + <message> + <source>UDP Notify Port</source> +- <translation>UPD-notifiseringsport</translation> ++ <translation>UDP-notifiseringsport</translation> + </message> + <message> + <source>During playback, MythTV will listen for connections from the "mythtvosd" or "mythudprelay" programs on this port. See the README in contrib/mythnotify/ for additional information.</source> +@@ -4662,7 +4662,7 @@ + </message> + <message> + <source>"Fill" is the quickest shading method. "Image" is somewhat slow, but has a higher visual quality. No shading will be the fastest.</source> [...47238 lines suppressed...] + #define DCT6416_MODEL_ID1 0x0000646b + +-#define AVC1394_SUBUNIT_TYPE_6200 (9 << 19) /* uses a reserved subunit type */ ++#define QIP7100_VENDOR_ID1 0x00002374 ++#define QIP7100_MODEL_ID1 0x00008100 ++#define QIP7100_MODEL_ID2 0x00000001 + +-#define AVC1394_6200_COMMAND_CHANNEL 0x000007C00 /* 6200 subunit command */ ++#define MOT_UNKNOWN_VENDOR_ID1 0x04db ++#define MOT_UNKNOWN_VENDOR_ID2 0x0406 ++#define MOT_UNKNOWN_VENDOR_ID3 0x0ce5 ++#define MOT_UNKNOWN_VENDOR_ID4 0x111a ++#define MOT_UNKNOWN_VENDOR_ID5 0x1225 ++#define MOT_UNKNOWN_VENDOR_ID6 0x1404 ++#define MOT_UNKNOWN_VENDOR_ID7 0x1626 ++#define MOT_UNKNOWN_VENDOR_ID8 0x18c0 ++#define MOT_UNKNOWN_VENDOR_ID9 0x1ade ++#define MOT_UNKNOWN_VENDOR_ID10 0x1cfb ++#define MOT_UNKNOWN_VENDOR_ID11 0x2040 ++#define MOT_UNKNOWN_VENDOR_ID12 0x211e ++#define MOT_UNKNOWN_VENDOR_ID13 0x2180 ++#define MOT_UNKNOWN_VENDOR_ID14 0x2210 ++#define MOT_UNKNOWN_VENDOR_ID15 0x230b ++#define MOT_UNKNOWN_VENDOR_ID16 0x2375 ++#define MOT_UNKNOWN_VENDOR_ID17 0x2395 ++#define MOT_UNKNOWN_VENDOR_ID18 0x23a2 ++#define MOT_UNKNOWN_VENDOR_ID19 0x23ed ++#define MOT_UNKNOWN_VENDOR_ID20 0x23ee ++#define MOT_UNKNOWN_VENDOR_ID21 0x23a0 ++#define MOT_UNKNOWN_VENDOR_ID22 0x23a1 ++ ++#define PACE_VENDOR_ID1 0x00005094 /* 550 & 779 */ ++#define PACE_VENDOR_ID2 0x00005094 /* unknown */ ++#define PACE550_MODEL_ID1 0x00010551 ++#define PACE779_MODEL_ID1 0x00010755 ++ + #define AVC1394_6200_OPERAND_SET 0x20 /* 6200 subunit command operand */ + +-#define CTL_CMD0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_6200 | \ +- AVC1394_SUBUNIT_ID_0 | AVC1394_6200_COMMAND_CHANNEL | \ ++#define CTL_CMD0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_PANEL | \ ++ AVC1394_SUBUNIT_ID_0 | AVC1394_PANEL_COMMAND_PASS_THROUGH | \ + AVC1394_6200_OPERAND_SET + + #define STARTING_NODE 1 /* skip 1394 nodes to avoid error msgs */ +@@ -171,7 +207,7 @@ + + if (!handle) { + if (!errno) { +- fprintf(stderr, "Not Compatable!\n"); ++ fprintf(stderr, "Not Compatible!\n"); + } else { + perror("Couldn't get 1394 handle"); + fprintf(stderr, "Is ieee1394, driver, and raw1394 loaded?\n"); +@@ -218,9 +254,13 @@ + + // WARNING: Please update firewiredevice.cpp when adding to this list. + if ( ((dir.vendor_id == DCH3200_VENDOR_ID1) || +- (dir.vendor_id == DCT3412_VENDOR_ID1) || +- (dir.vendor_id == DCT3416_VENDOR_ID1) || +- (dir.vendor_id == DCT3416_VENDOR_ID2) || ++ (dir.vendor_id == DCH3200_VENDOR_ID2) || ++ (dir.vendor_id == DCH3200_VENDOR_ID3) || ++ (dir.vendor_id == DCH3200_VENDOR_ID4) || ++ (dir.vendor_id == DCH3416_VENDOR_ID1) || ++ (dir.vendor_id == DCT3412_VENDOR_ID1) || ++ (dir.vendor_id == DCT3416_VENDOR_ID1) || ++ (dir.vendor_id == DCT3416_VENDOR_ID2) || + (dir.vendor_id == DCT5100_VENDOR_ID1) || + (dir.vendor_id == DCT6200_VENDOR_ID1) || + (dir.vendor_id == DCT6200_VENDOR_ID2) || +@@ -237,11 +277,38 @@ + (dir.vendor_id == DCT6200_VENDOR_ID13) || + (dir.vendor_id == DCT6200_VENDOR_ID14) || + (dir.vendor_id == DCT6200_VENDOR_ID15) || ++ (dir.vendor_id == DCT6200_VENDOR_ID16) || + (dir.vendor_id == DCT6412_VENDOR_ID1) || + (dir.vendor_id == DCT6412_VENDOR_ID2) || +- (dir.vendor_id == DCT6416_VENDOR_ID1) || +- (dir.vendor_id == DCT6416_VENDOR_ID2)) && ++ (dir.vendor_id == DCT6416_VENDOR_ID1) || ++ (dir.vendor_id == DCT6416_VENDOR_ID2) || ++ (dir.vendor_id == QIP7100_VENDOR_ID1) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID1) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID2) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID3) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID4) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID5) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID6) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID7) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID8) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID9) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID10) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID11) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID12) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID13) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID14) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID15) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID16) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID17) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID18) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID19) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID20) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID21) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID22) || ++ (dir.vendor_id == PACE_VENDOR_ID1) || ++ (dir.vendor_id == PACE_VENDOR_ID2)) && + ((dir.model_id == DCH3200_MODEL_ID1) || ++ (dir.model_id == DCH3416_MODEL_ID1) || + (dir.model_id == DCT3412_MODEL_ID1) || + (dir.model_id == DCT3416_MODEL_ID1) || + (dir.model_id == DCT3416_MODEL_ID2) || +@@ -250,7 +317,12 @@ + (dir.model_id == DCT6200_MODEL_ID2) || + (dir.model_id == DCT6412_MODEL_ID1) || + (dir.model_id == DCT6412_MODEL_ID2) || +- (dir.model_id == DCT6416_MODEL_ID1)) ) { ++ (dir.model_id == DCT6416_MODEL_ID1) || ++ (dir.model_id == QIP7100_MODEL_ID1) || ++ (dir.model_id == QIP7100_MODEL_ID2) || ++ (dir.model_id == PACE550_MODEL_ID1) || ++ (dir.model_id == PACE779_MODEL_ID1)) ) ++ { + if (dir.unit_spec_id != DCT6200_SPEC_ID) + fprintf(stderr, "Warning: Unit Spec ID different.\n"); + if (dir.unit_sw_version != DCT6200_SW_VERSION) +Index: mythtv/contrib/channel_changers/sa3250ch.c +=================================================================== +--- mythtv/contrib/channel_changers/sa3250ch.c (revision 16468) ++++ mythtv/contrib/channel_changers/sa3250ch.c (working copy) +@@ -32,13 +32,24 @@ + + /* SA3250HD IDs */ + /* WARNING: Please update firewiredevice.cpp when adding to this list. */ +-#define SA_VENDOR_ID1 0x000011e6 +-#define SA_VENDOR_ID2 0x000014f8 +-#define SA_VENDOR_ID3 0x00001692 +-#define SA_VENDOR_ID4 0x00001947 +-#define SA_VENDOR_ID5 0x00000f21 +-#define SA_VENDOR_ID6 0x00001ac3 +-#define SA_VENDOR_ID7 0x00000a73 ++ ++#define SA_VENDOR_ID1 0x00000a73 ++#define SA_VENDOR_ID2 0x00000f21 ++#define SA_VENDOR_ID3 0x000011e6 ++#define SA_VENDOR_ID4 0x000014f8 ++#define SA_VENDOR_ID5 0x00001692 ++#define SA_VENDOR_ID6 0x00001868 ++#define SA_VENDOR_ID7 0x00001947 ++#define SA_VENDOR_ID8 0x00001ac3 ++#define SA_VENDOR_ID9 0x00001bd7 ++#define SA_VENDOR_ID10 0x00001cea ++#define SA_VENDOR_ID11 0x00001e6b ++#define SA_VENDOR_ID12 0x000021be ++#define SA_VENDOR_ID13 0x0000223a ++#define SA_VENDOR_ID14 0x000022ce ++#define SA_VENDOR_ID15 0x000023be ++#define SA_VENDOR_ID16 0x0000252e ++ + #define SA3250HD_MODEL_ID1 0x00000be0 + #define SA4200HD_MODEL_ID1 0x00001072 + #define SA4250HDC_MODEL_ID1 0x000010cc +@@ -130,13 +141,22 @@ + i, dir.vendor_id, dir.model_id); + + /* WARNING: Please update firewiredevice.cpp when adding to this list. */ +- if (((dir.vendor_id == SA_VENDOR_ID1) || +- (dir.vendor_id == SA_VENDOR_ID2) || +- (dir.vendor_id == SA_VENDOR_ID3) || +- (dir.vendor_id == SA_VENDOR_ID4) || +- (dir.vendor_id == SA_VENDOR_ID5) || +- (dir.vendor_id == SA_VENDOR_ID6) || +- (dir.vendor_id == SA_VENDOR_ID7)) && ++ if (((dir.vendor_id == SA_VENDOR_ID1) || ++ (dir.vendor_id == SA_VENDOR_ID2) || ++ (dir.vendor_id == SA_VENDOR_ID3) || ++ (dir.vendor_id == SA_VENDOR_ID4) || ++ (dir.vendor_id == SA_VENDOR_ID5) || ++ (dir.vendor_id == SA_VENDOR_ID6) || ++ (dir.vendor_id == SA_VENDOR_ID7) || ++ (dir.vendor_id == SA_VENDOR_ID8) || ++ (dir.vendor_id == SA_VENDOR_ID9) || ++ (dir.vendor_id == SA_VENDOR_ID10) || ++ (dir.vendor_id == SA_VENDOR_ID11) || ++ (dir.vendor_id == SA_VENDOR_ID12) || ++ (dir.vendor_id == SA_VENDOR_ID13) || ++ (dir.vendor_id == SA_VENDOR_ID14) || ++ (dir.vendor_id == SA_VENDOR_ID15) || ++ (dir.vendor_id == SA_VENDOR_ID16)) && + ((dir.model_id == SA3250HD_MODEL_ID1) || + (dir.model_id == SA4200HD_MODEL_ID1) || + (dir.model_id == SA4250HDC_MODEL_ID1))) + +Property changes on: mythtv/contrib/channel_changers +___________________________________________________________________ +Added: svn:ignore + + 6200ch +sa3250ch + + View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.35 -r 1.36 mythtv.spec Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- mythtv.spec 18 May 2009 02:39:32 -0000 1.35 +++ mythtv.spec 4 Jun 2009 04:09:35 -0000 1.36 @@ -1,128 +1,37 @@ -# -# Specfile for building MythTV and MythPlugins RPMs from a subversion checkout. -# -# by: Chris Petersen <rpm(a)forevermore.net> -# Jarod Wilson <jarod(a)wilsonet.com> -# -# Modified/Extended from the great (non-svn based) work of: -# Axel Thimm <Axel.Thimm(a)ATrpms.net> -# David Bussenschutt <buzz(a)oska.com> -# and others; see changelog at bottom for details. -# -# The latest version of this file can be found at: -# -# http://www.mythtv.org/wiki/index.php/Mythtv-svn-rpmbuild.spec -# -# Note: -# -# This spec relies upon several files included in the RPMFusion mythtv -# src.rpm file. Please install it into your build tree before trying to -# build anything with this spec. -# -# Explanation of options: -# -# --with proc_opt Enable MythTV's optimized processor detection code -# and override RPM's defaults. -# --with debug Enable debug mode -# -# The following options are disabled by default. Use these options to enable: -# -# --with directfb Enable directfb support -# -# The following options are enabled by default. Use these options to disable: -# -# --without xvmcnvidia Disable NVidia XvMC support -# --without perl Disable building of the perl bindings -# --without python Disable building of the python bindings -# -# # All plugins get built by default, but you can disable them as you wish: -# -# --without mytharchive -# --without mythbrowser -# --without mythflix -# --without mythgallery -# --without mythgame -# --without mythmovies -# --without mythmusic -# --without mythnews -# --without mythvideo -# --without mythweather -# --without mythzoneminder -# --without mythweb -# +# svn revision number +%define _svnver r20668 +%define branch release-0-21-fixes +# Nb: base 0.21 svn rev is r16468 +#define branch trunk + +# disabled options +%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} +%define with_directfb %{?_with_directfb: 1} %{?!_with_directfb: 0} +%define with_festival %{?_with_festival: 1} %{?!_with_festival: 0} +%define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0} -################################################################################ - -# A list of which applications we want to put into the desktop menu system %define desktop_applications mythfrontend mythtv-setup +%define desktop_vendor RPMFusion -# The vendor name we should attribute the aforementioned entries to -%define desktop_vendor RPMFusion - -# SVN Revision number and branch ID -%define _svnrev r20586 -%define branch trunk - -# -# Basic descriptive tags for this package: -# -Name: mythtv -Summary: A digital video recorder (DVR) application. -URL: http://www.mythtv.org/ -Group: Applications/Multimedia +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')} -# Version/Release info -Version: 0.22 +Summary: A digital video recorder (DVR) application +Name: mythtv +Version: 0.21 %if "%{branch}" == "trunk" -Release: 0.2.svn.%{_svnrev}%{?dist} +Release: 0.2.%{_svnver}%{?dist} %else -Release: 1%{?dist} +Release: 19%{?dist} %endif - +URL: http://www.mythtv.org/ # The primary license is GPLv2+, but bits are borrowed from a number of # projects... For a breakdown of the licensing, see PACKAGE-LICENSING. License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+) - -################################################################################ - -# Set "--with proc_opt" to let mythtv autodetect your CPU and run its -# processor-specific optimizations. It seems to cause compile problems on many -# systems (particularly x86_64), so it is classified by the MythTV developers -# as "use at your own risk." -%define with_proc_opt %{?_with_proc_opt: 1} %{!?_with_proc_opt: 0} - -# Set "--with debug" to enable MythTV debug compile mode -%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} - -# The following options are enabled by default. Use --without to disable them -%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1} -%define with_python %{?_without_python: 0} %{!?_without_python: 1} -%define with_pulseaudio %{?_without_pulseaudio: 0} %{!?_without_pulseaudio: 1} - -# The following options are disabled by default. Use --with to enable them -%define with_directfb %{?_with_directfb: 1} %{!?_with_directfb: 0} -%define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0} - -# All plugins get built by default, but you can disable them as you wish -%define with_plugins %{?_without_plugins: 0} %{!?_without_plugins: 1} -%define with_mytharchive %{?_without_mytharchive: 0} %{!?_without_mytharchive: 1} -%define with_mythbrowser %{?_without_mythbrowser: 0} %{!?_without_mythbrowser: 1} -%define with_mythflix %{?_without_mythflix: 0} %{!?_without_mythflix: 1} -%define with_mythgallery %{?_without_mythgallery: 0} %{!?_without_mythgallery: 1} -%define with_mythgame %{?_without_mythgame: 0} %{!?_without_mythgame: 1} -%define with_mythmovies %{?_without_mythmovies: 0} %{!?_without_mythmovies: 1} -%define with_mythmusic %{?_without_mythmusic: 0} %{!?_without_mythmusic: 1} -%define with_mythnews %{?_without_mythnews: 0} %{!?_without_mythnews: 1} -%define with_mythvideo %{?_without_mythvideo: 0} %{!?_without_mythvideo: 1} -%define with_mythweather %{?_without_mythweather: 0} %{!?_without_mythweather: 1} -%define with_mythweb %{?_without_mythweb: 0} %{!?_without_mythweb: 1} -%define with_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder: 1} - -################################################################################ - -Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2 -Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2 -Source10: PACKAGE-LICENSING +Group: Applications/Multimedia +Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2 +Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2 +Source10: PACKAGE-LICENSING Source101: mythbackend.sysconfig.in Source102: mythbackend.init.in Source103: mythbackend.logrotate.in @@ -132,194 +41,127 @@ Source109: mythtv-setup.desktop Source110: mysql.txt Source401: mythweb.conf -Patch0: mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -################################################################################ -# Python setup - -%if %{with_python} -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]')} -%endif - -################################################################################ - -# Global MythTV and Shared Build Requirements - -BuildRequires: desktop-file-utils -BuildRequires: freetype-devel >= 2 -BuildRequires: gcc-c++ -BuildRequires: mysql-devel >= 5 -BuildRequires: qt4-devel -BuildRequires: phonon-devel - -BuildRequires: lm_sensors-devel -BuildRequires: lirc-devel -BuildRequires: nasm, yasm-devel - -# X, and Xv video support -BuildRequires: libXmu-devel -BuildRequires: libXv-devel -BuildRequires: libXvMC-devel -BuildRequires: libXxf86vm-devel -BuildRequires: mesa-libGLU-devel -BuildRequires: xorg-x11-proto-devel -%ifarch %{ix86} x86_64 [...1752 lines suppressed...] -* Tue Apr 28 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20462 -- Update to pre-0.22 svn trunk, revision 20462 - -* Fri Apr 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20448 -- Update to pre-0.22 svn trunk, revision 20448 -- Add BR: pulseaudio-libs-devel to enable proper pulseaudio support (rfbz#567) - -* Mon Apr 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20371 -- Update to pre-0.22 svn trunk, revision 20371 -- Relocate Requires: wget to the sub-packages where necessary (rfbz#384) -- Don't use a52dec, mythtv has its own internal support these days - -* Tue Apr 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20317 -- Update to pre-0.22 svn trunk, revision 20317 - -* Tue Mar 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20293 -- Update to pre-0.22 svn trunk, revision 20293 -- Add BuildRequires: phonon-devel - -* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.22-0.2.svn.r20273 -- rebuild for new F11 features - -* Fri Mar 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20273 -- Update to pre-0.22 svn trunk, revision 20273 - -* Fri Mar 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20232 -- Update to pre-0.22 svn trunk, revision 20232 - -* Thu Mar 12 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20196 -- Update to pre-0.22 svn trunk, revision r20196 -- Carries work-around for qt 4.5 "everthing is a prepared statement now" - bug/quirk (rpmfusion bz#421) - -* Wed Mar 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20107 -- Update to pre-0.22 svn trunk, revision 20107 -- Features misc gcc 4.4 and qt 4.5 build fixage - -* Mon Mar 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20089 -- Update to pre-0.22 svn trunk, revision 20089 +%dir %{_sysconfdir}/mythgame +%config(noreplace) %{_sysconfdir}/mythgame/gamelist.xml +%{_libdir}/mythtv/plugins/libmythgame.so +%{_datadir}/mythtv/games +%exclude %{_datadir}/mythtv/games/xmame +%{_datadir}/mythtv/game_settings.xml +%{_datadir}/mythtv/i18n/mythgame_*.qm +%exclude %{_datadir}/mame/screens -* Wed Feb 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20019 -- Update to pre-0.22 svn trunk, revision 20019 +#files -n mythgame-emulators +#defattr(-,root,root,-) +#{_datadir}/mythtv/games/xmame +#{_datadir}/mame/screens +#{_datadir}/mame/flyers -* Wed Feb 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19980 -- Update to pre-0.22 svn trunk, revision 19980 +%files -n mythnews +%defattr(-,root,root,-) +%doc mythplugins-%{version}/mythnews/AUTHORS +%doc mythplugins-%{version}/mythnews/COPYING +%doc mythplugins-%{version}/mythnews/README +%{_libdir}/mythtv/plugins/libmythnews.so +%{_datadir}/mythtv/mythnews +%{_datadir}/mythtv/i18n/mythnews_*.qm -* Thu Jan 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19874 -- Update to pre-0.22 svn trunk, revision 19874 +%files -n mythbrowser +%defattr(-,root,root,-) +%doc mythplugins-%{version}/mythbrowser/AUTHORS +%doc mythplugins-%{version}/mythbrowser/COPYING +%doc mythplugins-%{version}/mythbrowser/README +%{_bindir}/mythbrowser +%{_libdir}/mythtv/plugins/libmythbookmarkmanager.so +%{_datadir}/mythtv/i18n/mythbrowser_*.qm -* Sat Jan 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19811 -- Update to pre-0.22 svn trunk, revision 19811 -- Drop mythcontrols plugin (functionality merged into mythfrontend) -- Re-enable building iptv support +%files -n mythphone +%defattr(-,root,root,-) +%doc mythplugins-%{version}/mythphone/AUTHORS +%doc mythplugins-%{version}/mythphone/COPYING +%doc mythplugins-%{version}/mythphone/README +%doc mythplugins-%{version}/mythphone/TODO +%{_libdir}/mythtv/plugins/libmythphone.so +%{_datadir}/mythtv/i18n/mythphone_*.qm + +%files -n mythcontrols +%defattr(-,root,root,-) +%doc mythplugins-%{version}/mythcontrols/AUTHORS +%doc mythplugins-%{version}/mythcontrols/COPYING +%doc mythplugins-%{version}/mythcontrols/README +%doc mythplugins-%{version}/mythcontrols/TODO +%{_libdir}/mythtv/plugins/libmythcontrols.so +%{_datadir}/mythtv/i18n/mythcontrols_*.qm -* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19722 -- Update to pre-0.22 svn trunk, revision 19722 -- MythPhone plugin is dead as a doornail (MythTV changeset 19702) +%files -n mythflix +%defattr(-,root,root,-) +%doc mythplugins-%{version}/mythflix/AUTHORS +%doc mythplugins-%{version}/mythflix/COPYING +%doc mythplugins-%{version}/mythflix/README +%{_libdir}/mythtv/plugins/libmythflix.so +%{_datadir}/mythtv/mythflix +%{_datadir}/mythtv/i18n/mythflix_*.qm +%{_datadir}/mythtv/i18n/mythflix_*.ts +%{_datadir}/mythtv/netflix_menu.xml -* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19721 -- Update to pre-0.22 svn trunk, revision 19721 +%files -n mytharchive +%defattr(-,root,root,-) +%doc mythplugins-%{version}/mytharchive/AUTHORS +%doc mythplugins-%{version}/mytharchive/COPYING +%doc mythplugins-%{version}/mytharchive/README +%doc mythplugins-%{version}/mytharchive/TODO +%{_bindir}/mytharchivehelper +%{_libdir}/mythtv/plugins/libmytharchive.so +%{_datadir}/mythtv/archiveformat.xml +%{_datadir}/mythtv/archivemenu.xml +%{_datadir}/mythtv/archiveutils.xml +%{_datadir}/mythtv/mytharchive +%{_datadir}/mythtv/i18n/mytharchive_*.qm -* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19630 -- Update to pre-0.22 svn trunk, revision 19630 -- Fix a %%files list screw-up w/mythgame-emulators nukage +%files -n mythzoneminder +%defattr(-,root,root,-) +%{_libdir}/mythtv/plugins/libmythzoneminder.so +%{_datadir}/mythtv/zonemindermenu.xml +%{_bindir}/mythzmserver -* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19622 -- Update to pre-0.22 svn trunk, revision 19622 +%files -n mythweb +%defattr(-,root,root,-) +%doc mythplugins-%{version}/mythweb/README +%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf +%defattr(-,apache,apache,0775) +%dir %{_datadir}/mythweb +%{_datadir}/mythweb/* -* Fri Jan 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19534 -- Update to pre-0.22 svn trunk, revision 19534 -- Re-disable mythgame-emulators sub-pgk, was accidentally re-enabled +%files -n perl-MythTV +%defattr(-,root,root,-) +%{perl_vendorlib}/MythTV.pm +%dir %{perl_vendorlib}/MythTV +%{perl_vendorlib}/MythTV/*.pm +%dir %{perl_vendorlib}/IO/Socket +%dir %{perl_vendorlib}/IO/Socket/INET +%{perl_vendorlib}/IO/Socket/INET/MythTV.pm +%exclude %{perl_vendorarch}/auto/MythTV/.packlist -* Sun Dec 28 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19467 -- Update to pre-0.22 svn trunk, revision 19467 +%files -n python-MythTV +%defattr(-,root,root,-) +%dir %{python_sitelib}/MythTV/ +%{python_sitelib}/MythTV/* +%if 0%{?fedora} >= 9 +%{python_sitelib}/MythTV-*.egg-info +%endif -* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390 -- MythTV svn trunk (pre-0.22), revision 19390 -- Re-enable fast cmov on x86_64 by default -- Add BR: yasm-devel to enable yasm-specific improvements +%changelog +* Wed Jun 03 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-19 +- Update to release-0-21-fixes patches (r20668) -* Sat Dec 13 2008 Chris Petersen <rpm(a)forevermore.net> 0.22-0.1.svn -- Update to compile for pre-0.22 svn trunk, including new files and qt4 deps -- Major cleanup and porting from my personal spec (which was a combination - of works from atrpms and some of Jarod's earlier works). -- Add a few more --with and --without options, including the ability to - disable specific mythplugins and/or all plugins. +* Mon Apr 13 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-18 +- Update release-0-21-fixes patches (r20373) +- Slide Requires: wget into more appropriate places (rfbz#384) + +* Thu Jan 22 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-17 +- Update release-0-21-fixes patches (r19788) +- Add Require: perl-XML-SAX to mythweather (rpmfusion bz#337) + +* Tue Dec 30 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-16 +- Update release-0-21-fixes patches (r19505) +- Fixes infinite loop introduced by firewire fix in -15 (rpmfusion bz#286) * Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15 - Update to release-0-21-fixes patches (r19344) Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 18 May 2009 02:39:32 -0000 1.17 +++ sources 4 Jun 2009 04:09:35 -0000 1.18 @@ -1,4 +1,4 @@ be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png -3b4fe8951562a25a8f8ff7f268ae18f1 mythtv-0.22.tar.bz2 -a4928864b9726819e28b75e018270fc1 mythplugins-0.22.tar.bz2 +6c08043227bef1384858deee12b5cdc3 mythplugins-0.21.tar.bz2 +49fc135e1cde90cd935c1229467fa37e mythtv-0.21.tar.bz2

15 years, 5 months

1
0
0 / 0

rpms/mythtv/F-10 mythplugins-0.21-svnfixes.patch, 1.9, 1.10 mythtv-0.21-svnfixes.patch, 1.8, 1.9 mythtv.spec, 1.18, 1.19

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv2292 Modified Files: mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch mythtv.spec Log Message: * Wed Jun 03 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-19 - Update to release-0-21-fixes patches (r20668) mythplugins-0.21-svnfixes.patch: Index: mythplugins-0.21-svnfixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-10/mythplugins-0.21-svnfixes.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mythplugins-0.21-svnfixes.patch 14 Apr 2009 02:53:13 -0000 1.9 +++ mythplugins-0.21-svnfixes.patch 4 Jun 2009 04:02:20 -0000 1.10 @@ -4120,11 +4120,177 @@ #include "aacdecoder.h" #include "constants.h" +Index: mythplugins/mythmusic/mythmusic/globalsettings.cpp +=================================================================== +--- mythplugins/mythmusic/mythmusic/globalsettings.cpp (revision 16468) ++++ mythplugins/mythmusic/mythmusic/globalsettings.cpp (working copy) +@@ -58,20 +58,11 @@ + return gc; + }; + +-static HostComboBox *CDDevice() ++static HostLineEdit *CDDevice() + { +- HostComboBox *gc = new HostComboBox("CDDevice", true); ++ HostLineEdit *gc = new HostLineEdit("CDDevice", true); + gc->setLabel(QObject::tr("CD device")); +- QDir dev("/dev", "cdrom*", QDir::Name, QDir::System); +- gc->fillSelectionsFromDir(dev); +- dev.setNameFilter("scd*"); +- gc->fillSelectionsFromDir(dev); +- dev.setNameFilter("hd*"); +- gc->fillSelectionsFromDir(dev); +- +- dev.setNameFilter("cdrom*"); +- dev.setPath("/dev/cdroms"); +- gc->fillSelectionsFromDir(dev); ++ gc->setValue("default"); + gc->setHelpText(QObject::tr("CDRom device used for ripping/playback.")); + return gc; + }; +@@ -472,85 +463,14 @@ + return gc; + }; + +-static HostComboBox *CDWriterDevice() ++static HostLineEdit *CDWriterDevice() + { +- HostComboBox *gc = new HostComboBox("CDWriterDevice"); +- +- QString argadd[3] = { "", "-dev=ATA", "-dev=ATAPI" }; +- QString prepend[3] = { "", "ATA:", "ATAPI:" }; +- +- for (int i = 0; i < 3; i++) +- { +- QStringList args; +- QStringList result; +- +- args = "cdrecord"; +- args += "--scanbus"; +- +- if (argadd[i].length() > 1) +- args += argadd[i]; +- +- QString cmd = args.join(" "); +- QProcess proc(args); +- +- MythTimer totaltimer; +- +- if (proc.start()) +- { +- totaltimer.start(); +- +- while (1) +- { +- while (proc.canReadLineStdout()) +- result += proc.readLineStdout(); +- if (proc.isRunning()) +- { +- qApp->processEvents(); +- usleep(10000); +- } +- else +- { +- if (!proc.normalExit()) +- VERBOSE(VB_GENERAL, +- QString("Failed to run '%1'").arg(cmd)); +- break; +- } +- +- if (totaltimer.elapsed() > 1500) +- { +- //VERBOSE(VB_GENERAL, QString("Killed '%1' after %2ms") +- // .arg(cmd).arg(totaltimer.elapsed())); +- proc.kill(); +- } +- } +- } +- else +- VERBOSE(VB_GENERAL, QString("Failed to run '%1'").arg(cmd)); +- +- while (proc.canReadLineStdout()) +- result += proc.readLineStdout(); +- +- for (QStringList::Iterator it = result.begin(); it != result.end(); +- ++it) +- { +- QString line = *it; +- if (line.length() > 12) +- { +- if (line[10] == ')' && line[12] != '*') +- { +- QString dev = prepend[i] + line.mid(1, 5); +- QString name = line.mid(24, 16); +- +- gc->addSelection(name, dev); +- VERBOSE(VB_GENERAL, "MythMusic adding CD-Writer: " +- + dev + " -- " + name); +- } +- } +- } +- } +- ++ HostLineEdit *gc = new HostLineEdit("CDWriterDevice"); ++ gc->setValue("default"); + gc->setLabel(QObject::tr("CD-Writer Device")); +- gc->setHelpText(QObject::tr("Select the SCSI or IDE Device for CD Writing.")); ++ gc->setHelpText(QObject::tr("Select the SCSI or IDE Device for CD Writing.") ++ + QObject::tr(" 'default' will let the " ++ "MediaMonitor choose a device.")); + return gc; + }; + +Index: mythplugins/mythmusic/mythmusic/playlist.cpp +=================================================================== +--- mythplugins/mythmusic/mythmusic/playlist.cpp (revision 16468) ++++ mythplugins/mythmusic/mythmusic/playlist.cpp (working copy) +@@ -10,6 +10,7 @@ + #include "smartplaylist.h" + #include <mythtv/mythdbcon.h> + #include <mythtv/compat.h> ++#include <mythtv/mythmediamonitor.h> + + #include <qfileinfo.h> + #include <qprocess.h> +@@ -1664,7 +1665,7 @@ + return 1; + } + +- QString scsidev = gContext->GetSetting("CDWriterDevice"); ++ QString scsidev = MediaMonitor::defaultCDWriter(); + if (scsidev.isEmpty() || scsidev.isNull()) + { + VERBOSE(VB_GENERAL, "No CD Writer device defined."); Index: mythplugins/mythmusic/mythmusic/databasebox.cpp =================================================================== --- mythplugins/mythmusic/mythmusic/databasebox.cpp (revision 16468) +++ mythplugins/mythmusic/mythmusic/databasebox.cpp (working copy) -@@ -875,9 +875,15 @@ +@@ -17,6 +17,7 @@ + #include <mythtv/lcddevice.h> + #include <mythtv/uitypes.h> + #include <mythtv/uilistbtntype.h> ++#include <mythtv/mythmediamonitor.h> + + // mythmusic + #include "metadata.h" +@@ -421,12 +422,13 @@ + return; + } + +- QString scsidev = gContext->GetSetting("CDWriterDevice"); +- if (scsidev.length()==0) ++ QString scsidev = MediaMonitor::defaultCDWriter(); ++ if (scsidev.isEmpty() || scsidev.isNull()) + { +- VERBOSE(VB_GENERAL, "We don't have SCSI devices"); ++ VERBOSE(VB_GENERAL, "No CD Writer device defined."); + return; + } ++ + // Begin Blanking + MythProgressDialog *record_progress; + record_progress = new MythProgressDialog(tr("CD-RW Blanking Progress"), 10); +@@ -875,9 +877,15 @@ if (cdwriter) { @@ -4140,7 +4306,7 @@ cdmp3b = active_popup->addButton(tr("Create MP3 CD from Playlist"), this, SLOT(CreateCDMP3())); -@@ -920,8 +926,12 @@ +@@ -920,8 +928,12 @@ active_popup->addLabel(label2); cdmp3b->setEnabled((ratio_MB <= 100.0)); @@ -6286,7 +6452,54 @@ =================================================================== --- mythplugins/mytharchive/mytharchivehelper/main.cpp (revision 16468) +++ mythplugins/mytharchive/mytharchivehelper/main.cpp (working copy) -@@ -2068,6 +2068,7 @@ +@@ -176,23 +176,27 @@ + QString dvdDrive = gContext->GetSetting("MythArchiveDVDLocation", "/dev/dvd"); + VERBOSE(VB_JOBQUEUE, "Burning ISO image to " + dvdDrive); + ++ int driveSpeed = gContext->GetNumSetting("MythArchiveDriveSpeed"); + QString tempDirectory = getTempDirectory(); + + tempDirectory += "work/"; + +- QString growisofs = gContext->GetSetting("MythArchiveGrowisofsCmd", "growisofs"); +- QString command; ++ QString command = gContext->GetSetting("MythArchiveGrowisofsCmd", ++ "growisofs"); + ++ if (driveSpeed) ++ command += " -speed=" + QString::number(driveSpeed); ++ + if (nativeFormat) + { + if (mediaType == AD_DVD_RW && bEraseDVDRW == true) + { +- command = growisofs + " -use-the-force-luke -Z " + dvdDrive; ++ command += " -use-the-force-luke -Z " + dvdDrive; + command += " -V 'MythTV Archive' -R -J " + tempDirectory; + } + else + { +- command = growisofs + " -Z " + dvdDrive; ++ command += " -Z " + dvdDrive; + command += " -V 'MythTV Archive' -R -J " + tempDirectory; + } + } +@@ -200,12 +204,12 @@ + { + if (mediaType == AD_DVD_RW && bEraseDVDRW == true) + { +- command = growisofs + " -dvd-compat -use-the-force-luke -Z " + dvdDrive; ++ command += " -dvd-compat -use-the-force-luke -Z " + dvdDrive; + command += " -dvd-video -V 'MythTV DVD' " + tempDirectory + "/dvd"; + } + else + { +- command = growisofs + " -dvd-compat -Z " + dvdDrive; ++ command += " -dvd-compat -Z " + dvdDrive; + command += " -dvd-video -V 'MythTV DVD' " + tempDirectory + "/dvd"; + } + } +@@ -2068,6 +2072,7 @@ root.appendChild(streams); streams.setAttribute("count", inputFC->nb_streams); int ffmpegIndex = 0; @@ -6294,7 +6507,7 @@ for (uint i = 0; i < inputFC->nb_streams; i++) { -@@ -2124,56 +2125,60 @@ +@@ -2124,56 +2129,60 @@ streams.appendChild(stream); @@ -6396,7 +6609,7 @@ break; } -@@ -2185,7 +2190,14 @@ +@@ -2185,7 +2194,14 @@ QDomElement stream = doc.createElement("audio"); stream.setAttribute("streamindex", i); stream.setAttribute("ffmpegindex", ffmpegIndex++); @@ -6421,7 +6634,7 @@ # version of script - change after each update -VERSION="0.1.20080127-1" -+VERSION="0.1.20080726-1-fixes" ++VERSION="0.1.20090515-1-fixes" # keep all temporary files for debugging purposes # set this to True before a first run through when testing @@ -6595,7 +6808,17 @@ write("Finished creating ISO image") -@@ -2575,7 +2600,7 @@ +@@ -2570,12 +2595,17 @@ + os.close(f); + + if drivestatus == CDROM.CDS_DISC_OK or drivestatus == CDROM.CDS_NO_INFO: ++ ++ # If the frontend has a previously burnt DVD+RW mounted, ++ # growisofs will fail to burn it, so try to pumount it first... ++ runCommand("pumount " + dvddrivepath); ++ + if mediatype == DVD_RW and erasedvdrw == True: + command = path_growisofs[0] + " -dvd-compat " if drivespeed != 0: command += "-speed=%d " % drivespeed command += " -use-the-force-luke -Z " + dvddrivepath @@ -6604,7 +6827,7 @@ command += os.path.join(getTempPath(),'dvd') else: command = path_growisofs[0] + " -dvd-compat " -@@ -2954,7 +2979,8 @@ +@@ -2954,7 +2984,8 @@ dvdauthor_element.appendChild(titleset) #Comment XML file with title of video @@ -6614,7 +6837,7 @@ menus= dvddom.createElement("menus") titleset.appendChild(menus) -@@ -4585,23 +4611,23 @@ +@@ -4585,23 +4616,23 @@ # process a single file ready for burning using either # mythtranscode/mythreplex or ProjectX as the cutter/demuxer @@ -6643,7 +6866,7 @@ write( "*************************************************************") #As part of this routine we need to pre-process the video this MAY mean: -@@ -4642,7 +4668,7 @@ +@@ -4642,7 +4673,7 @@ localfile = file.attributes["localfilename"].value else: localfile = "" @@ -6652,7 +6875,7 @@ chanid = getText(infoDOM.getElementsByTagName("chanid")[0]) starttime = getText(infoDOM.getElementsByTagName("starttime")[0]) if runMythtranscode(chanid, starttime, os.path.join(folder,'newfile.mpg'), True, localfile): -@@ -4665,7 +4691,7 @@ +@@ -4665,7 +4696,7 @@ if runMythtranscode(chanid, starttime, os.path.join(folder, 'newfile.mpg'), False, localfile): mediafile = os.path.join(folder, 'newfile.mpg') else: @@ -6661,7 +6884,7 @@ else: #does the user always want to run mpeg2 files through mythtranscode? #may help to fix any errors in the file -@@ -4685,7 +4711,7 @@ +@@ -4685,7 +4716,7 @@ if runMythtranscode(chanid, starttime, os.path.join(folder, 'newfile.mpg'), False, localfile): mediafile = os.path.join(folder, 'newfile.mpg') else: @@ -6670,7 +6893,7 @@ #do we need to re-encode the file to make it DVD compliant? if not isFileOkayForDVD(file, folder): -@@ -4801,7 +4827,7 @@ +@@ -4801,7 +4832,7 @@ extractVideoFrame(os.path.join(folder, "stream.mv2"), titleImage, thumboffset) write( "*************************************************************") @@ -6679,7 +6902,7 @@ write( "*************************************************************") -@@ -4809,11 +4835,11 @@ +@@ -4809,11 +4840,11 @@ # process a single file ready for burning using projectX to # cut and demux @@ -6693,7 +6916,7 @@ write( "*************************************************************") #As part of this routine we need to pre-process the video this MAY mean: -@@ -4970,7 +4996,7 @@ +@@ -4970,7 +5001,7 @@ extractVideoFrame(os.path.join(folder, "stream.mv2"), titleImage, thumboffset) write( "*************************************************************") @@ -6702,7 +6925,7 @@ write( "*************************************************************") ############################################################# -@@ -5102,7 +5128,7 @@ +@@ -5102,7 +5133,7 @@ os.rmdir (folder) os.makedirs(folder) #Do the pre-process work @@ -6711,7 +6934,7 @@ if debug_secondrunthrough==False: #Loop through all the files again but this time do more serious work! -@@ -5112,7 +5138,7 @@ +@@ -5112,7 +5143,7 @@ folder=getItemTempPath(filecount) #Process this file @@ -6720,7 +6943,7 @@ #We can only create the menus after the videos have been processed #and the commercials cut out so we get the correct run time length -@@ -5185,6 +5211,9 @@ +@@ -5185,6 +5216,9 @@ if infoDOM.documentElement.tagName != "fileinfo": fatalError("The info.xml file (%s) doesn't look right" % os.path.join(folder,"info.xml")) title = expandItemText(infoDOM,"%title",1,0,0,0,0) @@ -10122,6 +10345,44 @@ </message> </context> <context> +Index: mythplugins/mythgallery/mythgallery/iconview.cpp +=================================================================== +--- mythplugins/mythgallery/mythgallery/iconview.cpp (revision 16468) ++++ mythplugins/mythgallery/mythgallery/iconview.cpp (working copy) +@@ -1215,6 +1215,9 @@ + item = new UIListBtnTypeItem(m_submenuType, tr("Show Devices")); + item->setData(new MenuAction(&IconView::HandleShowDevices)); + ++ item = new UIListBtnTypeItem(m_submenuType, tr("Eject")); ++ item->setData(new MenuAction(&IconView::HandleEject)); ++ + item = new UIListBtnTypeItem(m_submenuType, tr("Import")); + item->setData(new MenuAction(&IconView::HandleImport)); + +@@ -1327,6 +1330,11 @@ + } + } + ++void IconView::HandleEject(void) ++{ ++ myth_eject(); ++} ++ + void IconView::HandleImport(void) + { + QFileInfo path; +Index: mythplugins/mythgallery/mythgallery/iconview.h +=================================================================== +--- mythplugins/mythgallery/mythgallery/iconview.h (revision 16468) ++++ mythplugins/mythgallery/mythgallery/iconview.h (working copy) +@@ -91,6 +91,7 @@ + void HandleSlideShow(void); + void HandleRandomShow(void); + void HandleSettings(void); ++ void HandleEject(void); + void HandleImport(void); + void HandleShowDevices(void); + void HandleCopyHere(void); Index: mythplugins/mythmovies/ignyte/ignytegrabber.cpp =================================================================== --- mythplugins/mythmovies/ignyte/ignytegrabber.cpp (revision 16468) @@ -12712,15 +12973,39 @@ =================================================================== --- mythplugins/mythvideo/mythvideo/globalsettings.cpp (revision 16468) +++ mythplugins/mythvideo/mythvideo/globalsettings.cpp (working copy) -@@ -322,6 +322,8 @@ +@@ -309,10 +309,12 @@ + { + HostLineEdit *gc = new HostLineEdit("VCDDeviceLocation"); + gc->setLabel(QObject::tr("Location of VCD device")); +- gc->setValue("/dev/cdrom"); ++ gc->setValue("default"); + gc->setHelpText(QObject::tr("This device must exist, and the user " + "running MythDVD needs to have read permission " +- "on the device.")); ++ "on the device.") ++ + QObject::tr(" 'default' will let the " ++ "MediaMonitor choose a device.")); + return gc; + } + +@@ -320,14 +322,12 @@ + { + HostLineEdit *gc = new HostLineEdit("DVDDeviceLocation"); gc->setLabel(QObject::tr("Location of DVD device")); - #ifdef Q_WS_MACX +-#ifdef Q_WS_MACX gc->setValue("default"); -+#elif defined(_WIN32) -+ gc->setValue("D:\\"); - #else - gc->setValue("/dev/dvd"); - #endif +-#else +- gc->setValue("/dev/dvd"); +-#endif + gc->setHelpText(QObject::tr("This device must exist, and the user " + "running MythDVD needs to have read permission " +- "on the device.")); ++ "on the device.") ++ + QObject::tr(" 'default' will let the " ++ "MediaMonitor choose a device.")); + return gc; + } + Index: mythplugins/mythvideo/mythvideo/main.cpp =================================================================== --- mythplugins/mythvideo/mythvideo/main.cpp (revision 16468) @@ -15303,90 +15588,197 @@ =================================================================== --- mythplugins/mythnews/mythnews/news-sites.xml (revision 16468) +++ mythplugins/mythnews/mythnews/news-sites.xml (working copy) -@@ -725,85 +725,75 @@ +@@ -29,7 +29,7 @@ + + <item> + <title>Scotsman.com Entertainment News</title> +- <url>http://news.scotsman.com/entertainment.cfm?format=rss</url> ++ <url>http://news.scotsman.com/getFeed.aspx?Format=rss&sectionid=7010</url> + <ico>http://www.scotsman.com/favicon.ico</ico> + </item> + +@@ -456,73 +456,73 @@ + + <item> + <title>G4TV Attack of the Show Daily Video Podcast</title> +- <url>http://www.g4tv.com/attackoftheshow/podcasts/5/Attack_of_the_Show_Daily_V...</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/attackoftheshow/podcasts/5/Attack_of_the_Show_Daily_Video...</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV Cheat! Video Podcast</title> +- <url>http://www.g4tv.com/cheat/podcasts/7/Cheat_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/cheat/podcasts/7/Cheat_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV Cinematech: Nocturnal Emissions Video Podcast</title> +- <url>http://www.g4tv.com/cinematechnocturnalemissions/podcasts/9/Cinematech_No...</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/cinematechnocturnalemissions/podcasts/9/Cinematech_Noctur...</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + <item> + <title>G4TV Cinematech Video Podcast</title> +- <url>http://www.g4tv.com/cinematech/podcasts/8/Cinematech_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/cinematech/podcasts/8/Cinematech_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV ICONS Video Podcast</title> +- <url>http://www.g4tv.com/icons/podcasts/17/ICONS_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/icons/podcasts/17/ICONS_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV Filter Video Podcast</title> +- <url>http://www.g4tv.com/filter/podcasts/10/Filter_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/filter/podcasts/10/Filter_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV Formula D Video Podcast</title> +- <url>http://www.g4tv.com/formulad/podcasts/18/Formula_D_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/formulad/podcasts/18/Formula_D_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV Street Fury Video Podcast</title> +- <url>http://www.g4tv.com/streetfury/podcasts/11/Street_Fury_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/streetfury/podcasts/11/Street_Fury_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV The Daily Feed Video Podcast</title> +- <url>http://www.g4tv.com/thefeed/podcasts/19/The_Daily_Feed_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/thefeed/podcasts/19/The_Daily_Feed_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV The Daily Nut</title> +- <url>http://www.g4tv.com/dailynut/podcasts/15/The_Daily_Nut.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/dailynut/podcasts/15/The_Daily_Nut.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV The Man Show Video Podcast</title> +- <url>http://www.g4tv.com/themanshow/podcasts/14/The_Man_Show_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/themanshow/podcasts/14/The_Man_Show_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + <item> + <title>G4TV X-Play Daily Video Podcast</title> +- <url>http://www.g4tv.com/xplay/podcasts/6/XPlay_Daily_Video_Podcast.xml</url> +- <ico>http://www.g4tv.com/favicon.ico</ico> ++ <url>http://g4tv.com/xplay/podcasts/6/XPlay_Daily_Video_Podcast.xml</url> ++ <ico>http://g4tv.com/favicon.ico</ico> + </item> + + </category> +@@ -639,7 +639,7 @@ + + <item> + <title>Scotsman.com International News</title> +- <url>http://news.scotsman.com/international.cfm?format=rss</url> ++ <url>http://news.scotsman.com/getFeed.aspx?Format=rss&sectionid=7000</url> + <ico>http://www.scotsman.com/favicon.ico</ico> + </item> + +@@ -725,85 +725,55 @@ </item> <item> - <title>Digital Spy - Broadcasting</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dsbroadcast.xml</url> -+ <title>Digital Spy - News Headlines</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsall.xml</url> ++ <title>Digital Spy - Media Headlines</title> ++ <url>http://www.digitalspy.co.uk/rss/zones/gb/media.xml</url> </item> <item> - <title>Digital Spy - Cable</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dscable.xml</url> -+ <title>Digital Spy - Entertainment Headlines</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsentertainmentnews.xml</url> ++ <title>Digital Spy - Big Brother</title> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/bigbrother.xml</url> </item> <item> -- <title>Digital Spy - Cult</title> + <title>Digital Spy - Cult</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dscult.xml</url> -+ <title>Digital Spy - Media Headlines</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsmedianews.xml</url> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/cult.xml</url> </item> <item> - <title>Digital Spy - Entertainment Headlines</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dseznews.xml</url> -+ <title>Digital Spy - Digital TV</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsdigitaltv.xml</url> - </item> - - <item> +- </item> +- +- <item> - <title>Digital Spy - Gaydar</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dsgaydar.xml</url> -+ <title>Digital Spy - Broadcasting</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsbroadcasting.xml</url> - </item> - - <item> +- </item> +- +- <item> - <title>Digital Spy - Headlines</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dsukstd.xml</url> -+ <title>Digital Spy - Cult</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dscult.xml</url> - </item> - - <item> +- </item> +- +- <item> - <title>Digital Spy - Media Headlines</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dsmznews.xml</url> -+ <title>Digital Spy - Gay Spy</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsgayspy.xml</url> - </item> - - <item> +- </item> +- +- <item> <title>Digital Spy - Movies</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dsfilm.xml</url> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsmovies.xml</url> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/movies.xml</url> </item> <item> - <title>Digital Spy - Programming</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dsprogramming.xml</url> + <title>Digital Spy - Music</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsmusic.xml</url> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/music.xml</url> </item> <item> - <title>Digital Spy - Radio</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dsradio.xml</url> + <title>Digital Spy - Reality</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsrealitytv.xml</url> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/realitytv.xml</url> </item> <item> - <title>Digital Spy - Reality TV</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dsreality.xml</url> + <title>Digital Spy - Showbiz</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsshowbiz.xml</url> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/showbiz.xml</url> </item> <item> - <title>Digital Spy - Satellite</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dssatellite.xml</url> + <title>Digital Spy - Soaps</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dssoaps.xml</url> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/soaps.xml</url> </item> <item> @@ -15397,14 +15789,14 @@ - <item> <title>Digital Spy - Television</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dstv.xml</url> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dstv.xml</url> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/tv.xml</url> </item> <item> - <title>Digital Spy - Terrestrial</title> - <url>http://syndication.digitalspy.co.uk/xmlcache/dsterrestrial.xml</url> + <title>Digital Spy - US TV</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsustv.xml</url> ++ <url>http://www.digitalspy.co.uk/rss/categories/gb/ustv.xml</url> </item> - <item> @@ -15415,7 +15807,7 @@ </category> <category name="MythTV"> -@@ -840,7 +830,7 @@ +@@ -840,7 +810,7 @@ <item> <title>MythTV - Wiki Recent Changes</title> @@ -15424,15 +15816,41 @@ </item> </category> -@@ -986,6 +976,11 @@ +@@ -1019,7 +989,7 @@ + + <item> + <title>Scotsman.com Opinion</title> +- <url>http://news.scotsman.com/opinion.cfm?format=rss</url> ++ <url>http://news.scotsman.com/getFeed.aspx?Format=rss&sectionid=7074</url> + <ico>http://www.scotsman.com/favicon.ico</ico> </item> + +@@ -1115,18 +1085,25 @@ <item> -+ <title>Digital Spy - Odd Section</title> -+ <url>http://syndication.digitalspy.co.uk/rss_news/dsodd.xml</url> + <title>Helsingin Sanomat (FI)</title> +- <url>http://siirto.helsinginsanomat.fi/aukio/HS-Tuoreet-RSS.xml</url> ++ <url>http://www.hs.fi/uutiset/rss/</url> ++ <ico>http://www.hs.fi/static/hs/img/favicon.ico</ico> + </item> + + <item> ++ <title>YLE (FI)</title> ++ <url>http://www.yle.fi/uutiset/rss/paauutiset.xml</url> ++ <ico>http://www.yle.fi/favicon.ico</ico> + </item> -+ ++ + <item> - <title>Fark</title> - <url>http://feeds.feedburner.com/fark</url> - <ico>http://www.fark.com/favicon.ico</ico> + <title>Scotsman.com Headlines</title> +- <url>http://news.scotsman.com/index.cfm?format=rss</url> ++ <url>http://news.scotsman.com/getFeed.aspx?Format=rss&sectionid=4068</url> + <ico>http://www.scotsman.com/favicon.ico</ico> + </item> + + <item> + <title>Scotsman.com UK News</title> +- <url>http://news.scotsman.com/uk.cfm?format=rss</url> ++ <url>http://news.scotsman.com/getFeed.aspx?Format=rss&sectionid=7071</url> + <ico>http://www.scotsman.com/favicon.ico</ico> + </item> + mythtv-0.21-svnfixes.patch: Index: mythtv-0.21-svnfixes.patch =================================================================== RCS file: /cvs/free/rpms/mythtv/F-10/mythtv-0.21-svnfixes.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- mythtv-0.21-svnfixes.patch 14 Apr 2009 02:53:13 -0000 1.8 +++ mythtv-0.21-svnfixes.patch 4 Jun 2009 04:02:20 -0000 1.9 @@ -25167,7 +25167,7 @@ echo " --with-bindings=LIST install the bindings specified in the" echo " comma-separated list" echo " Supported bindings: perl, python" -@@ -904,6 +907,7 @@ +@@ -904,9 +907,11 @@ xvmc_vld dvdv fribidi @@ -25175,7 +25175,20 @@ ' MYTHTV_LIST=' -@@ -1178,6 +1182,7 @@ ++ audio_pulse + audio_alsa + audio_arts + audio_jack +@@ -1156,6 +1161,8 @@ + CONFIG_DEFINES="" + CONFIG_INCLUDEPATH="" + PROFILEFLAGS="" ++audio_pulse="default" ++audio_pulse_libs="-lpulse" + audio_alsa="default" + audio_alsa_libs="-lasound" + audio_arts="default" +@@ -1178,6 +1185,7 @@ joystick_menu="default" lamemp3="yes" lirc="yes" @@ -25183,7 +25196,7 @@ opengl="yes" v4l="yes" x11="yes" -@@ -1186,9 +1191,9 @@ +@@ -1186,9 +1194,9 @@ xv="yes" xvmc="yes" xvmc_lib="" @@ -25194,7 +25207,7 @@ # libraries enable zlib -@@ -1353,6 +1358,10 @@ +@@ -1353,6 +1361,10 @@ ;; --xvmc-lib=*) xvmc_lib="$optval" ;; @@ -25205,7 +25218,7 @@ --enable-mac-accel) dvdv="yes" ;; --disable-mac-accel) dvdv="no" -@@ -1382,6 +1391,10 @@ +@@ -1382,6 +1394,10 @@ # disabled due to abuse in Gentoo ebuild --disable-backend) ;; @@ -25216,7 +25229,7 @@ --previous|--prev) echo "No history of previous configure parameters." ;; -@@ -1475,6 +1488,7 @@ +@@ -1475,6 +1491,7 @@ fi fi cmov="yes" @@ -25224,7 +25237,7 @@ ;; # armv4l is a subset of armv[567]*l arm|armv[4567]*l) -@@ -1586,6 +1600,7 @@ +@@ -1586,6 +1603,7 @@ ;; freebsd) append CCONFIG "freebsd" @@ -25232,7 +25245,7 @@ disable need_memalign backend="yes" ;; -@@ -1599,10 +1614,13 @@ +@@ -1599,10 +1617,13 @@ enable darwin disable dvb disable ivtv @@ -25241,7 +25254,7 @@ - if [ ${osxver} = "9" ]; then - disable mmx - fi -+ if [[ ${ldver%.*} -lt "82" && ${osxver} = "9" && ${arch} = "x86_32" ]]; then ++ if [[ ${ldver%%.*} -lt "82" && ${osxver} = "9" && ${arch} = "x86_32" ]]; then + disable mmx + echo "You have a broken ld. Playback of HD videos may be very poor." + echo "See http://svn.mythtv.org/trac/ticket/4200 for intelleopardmmx.patch" @@ -25249,7 +25262,7 @@ disable need_memalign disable opengl_video disable opengl_vsync -@@ -1619,9 +1637,23 @@ +@@ -1619,9 +1640,23 @@ FFSERVERLDFLAGS=-Wl,-bind_at_load ;; mingw32*) @@ -25275,7 +25288,7 @@ shlibdir="$bindir" VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' -@@ -1629,17 +1661,7 @@ +@@ -1629,17 +1664,7 @@ VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale" VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)" fi @@ -25293,7 +25306,7 @@ SLIBPREF="lib" SLIBSUF=".dll" EXESUF=".exe" -@@ -2034,6 +2056,8 @@ +@@ -2034,6 +2059,8 @@ # EM64T era Intel Xeon if expr "$processor" : ".*Intel(R) Xeon(R) CPU.*5110" > /dev/null ; then ARCHFLAGS="-march=k8" # this would be pentium4 on 32 bit systems @@ -25302,7 +25315,20 @@ # Various Intel Duo processors (EMT64T capable) elif expr "$processor" : ".*Intel(R).*Core(TM)2.*CPU" > /dev/null ; then ARCHFLAGS="-march=k8" # this would be pentium4 on 32 bit systems -@@ -2691,6 +2715,9 @@ +@@ -2528,6 +2555,12 @@ + check_header sys/soundcard.h + check_header soundcard.h + ++# PulseAudio probe ++! disabled audio_pulse && ++ check_lib pulse/version.h pa_get_library_version $audio_pulse_libs && ++ enable audio_pulse || ++ disable audio_pulse ++ + # ALSA probe + ! disabled audio_alsa && + check_lib alsa/asoundlib.h snd_asoundlib_version $audio_alsa_libs && +@@ -2691,6 +2724,9 @@ fi fi @@ -25312,7 +25338,7 @@ enabled x11 && has_library libX11 || disable x11 enabled xrandr && has_header X11/extensions/Xrandr.h || disable xrandr enabled xv && has_library libXv || disable xv -@@ -2702,38 +2729,38 @@ +@@ -2702,38 +2738,38 @@ check_header X11/extensions/XvMClib.h has_library libXvMCW || disable xvmcw check_header X11/extensions/vldXvMC.h @@ -25368,7 +25394,7 @@ # Can only do Mac accel on Mac platform -@@ -2838,6 +2865,9 @@ +@@ -2838,6 +2874,9 @@ libdir="${PREFIX}/${libdir_name}" fi @@ -25378,7 +25404,7 @@ echo "# Basic Settings" echo "Compile type $compile_type" -@@ -2848,6 +2878,7 @@ +@@ -2848,6 +2887,7 @@ echo "Compiler cache $ccache$ccache_txt" echo "DistCC $distcc$distcc_txt" echo "install prefix $PREFIX" @@ -25386,7 +25412,15 @@ <<BLOCK_QUOTE echo "source path $source_path" echo "C compiler $cc" -@@ -3032,7 +3063,9 @@ +@@ -2973,6 +3013,7 @@ + if enabled frontend; then + echo + echo "# Sound Output Support" ++ echo "PulseAudio support ${audio_pulse-no}" + echo "OSS support ${audio_oss-no}" + echo "ALSA support ${audio_alsa-no}" + echo "aRts support ${audio_arts-no}" +@@ -3032,7 +3073,9 @@ echo "#define FFMPEG_CONFIG_H" >> $TMPH echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH @@ -25396,6 +25430,18 @@ echo "LIBDIR=$libdir" >> $MYTH_CONFIG_MAK <<BLOCK_QUOTE echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak +@@ -3151,6 +3194,11 @@ + echo "CONFIG_AUDIO_ALSA_LIBS=$audio_alsa_libs" >> $MYTH_CONFIG_MAK + fi + ++if enabled audio_pulse; then ++ append CCONFIG "using_pulse" ++ echo "CONFIG_AUDIO_PULSE_LIBS=$audio_pulse_libs" >> $MYTH_CONFIG_MAK ++fi ++ + if enabled audio_arts; then + append CCONFIG "using_arts" + echo "CONFIG_AUDIO_ARTS_LIBS=$audio_arts_libs" >> $MYTH_CONFIG_MAK Index: mythtv/themes/themes.pro =================================================================== --- mythtv/themes/themes.pro (revision 16468) @@ -27183,7 +27229,7 @@ Index: mythtv/libs/libs-targetfix.pro =================================================================== --- mythtv/libs/libs-targetfix.pro (revision 0) -+++ mythtv/libs/libs-targetfix.pro (revision 20373) ++++ mythtv/libs/libs-targetfix.pro (revision 20668) @@ -0,0 +1,20 @@ +# Common project modifications to change the generated target. + @@ -27205,6 +27251,19 @@ + target.path = $${PREFIX}/bin + } +} +Index: mythtv/libs/libmythtv/eit.cpp +=================================================================== +--- mythtv/libs/libmythtv/eit.cpp (revision 16468) ++++ mythtv/libs/libmythtv/eit.cpp (working copy) +@@ -239,7 +239,7 @@ + } + score /= al.size(); + +- return max(1000, score); ++ return min(1000, score); + } + + int DBEvent::GetMatch(const vector<DBEvent> &programs, int &bestmatch) const Index: mythtv/libs/libmythtv/NuppelVideoPlayer.cpp =================================================================== --- mythtv/libs/libmythtv/NuppelVideoPlayer.cpp (revision 16468) @@ -27584,15 +27643,84 @@ if (is_mot && !alt_method) { -@@ -444,6 +447,21 @@ +@@ -235,7 +238,7 @@ + cmd.push_back(kAVCControlCommand); + cmd.push_back(kAVCSubunitTypePanel | m_subunitid); + cmd.push_back(kAVCPanelPassThrough); +- cmd.push_back(kAVCPanelKey0 + digit[i] | kAVCPanelKeyPress); ++ cmd.push_back((kAVCPanelKey0 + digit[i]) | kAVCPanelKeyPress); + cmd.push_back(0x00); + cmd.push_back(0x00); + cmd.push_back(0x00); +@@ -399,8 +402,9 @@ + + const uint64_t sa_vendor_ids[] = + { +- 0x11e6, 0x14f8, 0x1692, 0x1947, 0x0f21, 0x1ac3, +- 0x0a73, ++ 0x0a73, 0x0f21, 0x11e6, 0x14f8, 0x1692, 0x1868, ++ 0x1947, 0x1ac3, 0x1bd7, 0x1cea, 0x1e6b, 0x21be, ++ 0x223a, 0x22ce, 0x23be, 0x252e, + }; + const uint sa_vendor_id_cnt = + sizeof(sa_vendor_ids) / sizeof(uint64_t); +@@ -415,19 +419,29 @@ + const uint64_t motorola_vendor_ids[] = + { + /* DCH-3200 */ +- 0x1c11, +- /* 3416 */ ++ 0x1c11, 0x1cfb, 0x1fc4, 0x23a3, ++ /* DCH-3416 */ ++ 0x1e46, ++ /* DCT-3416 */ + 0x1bdd, +- /* 3412 */ ++ /* DCT-3412 */ + 0x159a, +- /* 6200, 3416 */ ++ /* DCT-6200, DCT-3416 */ + 0x0ce5, 0x0e5c, 0x1225, 0x0f9f, 0x1180, + 0x12c9, 0x11ae, 0x152f, 0x14e8, 0x16b5, 0x1371, +- 0x19a6, 0x1aad, 0x0b06, 0x195e, +- /* 6212 */ ++ 0x19a6, 0x1aad, 0x0b06, 0x195e, 0x10dc, ++ /* DCT-6212 */ + 0x0f9f, 0x152f, +- /* 6216, 2224 */ ++ /* DCT-6216, 2224 */ + 0x17ee, 0x1a66, ++ /* QIP 7100 */ ++ 0x2374, ++ /* unknown, see http://standards.ieee.org/regauth/oui/oui.txt */ ++ 0x04db, 0x0406, 0x0ce5, 0x111a, 0x1225, 0x1404, ++ 0x1626, 0x18c0, 0x1ade, 0x1cfb, 0x2040, 0x211e, ++ 0x2180, 0x2210, 0x230b, 0x2375, 0x2395, 0x23a2, ++ 0x23ed, 0x23ee, 0x23a0, 0x23a1, ++ + }; + const uint motorola_vendor_id_cnt = + sizeof(motorola_vendor_ids) / sizeof(uint64_t); +@@ -435,6 +449,7 @@ + for (uint i = 0; i < motorola_vendor_id_cnt; i++) + { + id_to_model[motorola_vendor_ids[i] << 32 | 0xd330] = "DCH-3200"; ++ id_to_model[motorola_vendor_ids[i] << 32 | 0xb630] = "DCH-3416"; + id_to_model[motorola_vendor_ids[i] << 32 | 0x34cb] = "DCT-3412"; + id_to_model[motorola_vendor_ids[i] << 32 | 0x346b] = "DCT-3416"; + id_to_model[motorola_vendor_ids[i] << 32 | 0xb630] = "DCT-3416"; +@@ -443,13 +458,31 @@ + id_to_model[motorola_vendor_ids[i] << 32 | 0x64ca] = "DCT-6212"; id_to_model[motorola_vendor_ids[i] << 32 | 0x64cb] = "DCT-6212"; id_to_model[motorola_vendor_ids[i] << 32 | 0x646b] = "DCT-6216"; ++ id_to_model[motorola_vendor_ids[i] << 32 | 0x8100] = "QIP-7100"; ++ id_to_model[motorola_vendor_ids[i] << 32 | 0x0001] = "QIP-7100"; } + + const uint64_t pace_vendor_ids[] = + { + /* PACE 550-HD & 779 */ -+ 0x5094, ++ 0x1cc3, 0x5094, + }; + + const uint pace_vendor_id_cnt = @@ -27606,12 +27734,20 @@ } bool FirewireDevice::IsSTBSupported(const QString &panel_model) -@@ -458,6 +476,8 @@ + { + QString model = panel_model.upper(); + return ((model == "DCH-3200") || ++ (model == "DCH-3416") || + (model == "DCT-3412") || + (model == "DCT-3416") || + (model == "DCT-6200") || +@@ -458,6 +491,9 @@ (model == "SA3250HD") || (model == "SA4200HD") || (model == "SA4250HDC") || + (model == "PACE-550") || + (model == "PACE-779") || ++ (model == "QIP-7100") || (model == "GENERIC")); } @@ -28619,6 +28755,19 @@ } QString frequency(void) const { return pfrequency->getValue(); } +Index: mythtv/libs/libmythtv/eitfixup.cpp +=================================================================== +--- mythtv/libs/libmythtv/eitfixup.cpp (revision 16468) ++++ mythtv/libs/libmythtv/eitfixup.cpp (working copy) +@@ -71,7 +71,7 @@ + m_mcaCC(",?\\s(HI|English) Subtitles\\.?"), + m_mcaDD(",?\\sDD\\.?"), + m_RTLrepeat("(\$|\\s)?Wiederholung.+vo[m|n].+((?:\\d{2}\\.\\d{2}\\.\\d{4})|(?:\\d{2}[:\\.]\\d{2}\\sUhr))\$?"), +- m_RTLSubtitle("([^\\.]+)\\.\\s+(.+)"), ++ m_RTLSubtitle("^([^\\.]{3,})\\.\\s+(.+)"), + m_RTLSubtitle1("^Folge\\s(\\d{1,4})\\s*:\\s+'(.*)'(?:\\.\\s*|$)"), + m_RTLSubtitle2("^Folge\\s(\\d{1,4})\\s+(.{,5}[^\\.]{,120})[\\?!\\.]\\s*"), + m_RTLSubtitle3("^(?:Folge\\s)?(\\d{1,4}(?:\\/[IVX]+)?)\\s+(.{,5}[^\\.]{,120})[\\?!\\.]\\s*"), Index: mythtv/libs/libmythtv/diseqc.h =================================================================== --- mythtv/libs/libmythtv/diseqc.h (revision 16468) @@ -28803,7 +28952,40 @@ =================================================================== --- mythtv/libs/libmythtv/eithelper.cpp (revision 16468) +++ mythtv/libs/libmythtv/eithelper.cpp (working copy) -@@ -693,6 +693,20 @@ +@@ -393,7 +393,9 @@ + } + + QDateTime starttime = MythUTCToLocal(eit->StartTimeUTC(i)); +- EITFixUp::TimeFix(starttime); ++ // fix starttime only if the duration is a multiple of a minute ++ if (!(eit->DurationInSeconds(i) % 60)) ++ EITFixUp::TimeFix(starttime); + QDateTime endtime = starttime.addSecs(eit->DurationInSeconds(i)); + + DBEvent *event = new DBEvent(chanid, +@@ -495,7 +497,9 @@ + for (uint k=0; k<transmission.TransmissionCount(); ++k) + { + QDateTime starttime = transmission.StartTimeUTC(k); +- EITFixUp::TimeFix(starttime); ++ // fix starttime only if the duration is a multiple of a minute ++ if (!(cit->DurationInSeconds() % 60)) ++ EITFixUp::TimeFix(starttime); + QDateTime endtime = starttime.addSecs(cit->DurationInSeconds()); + + DBEvent *event = new DBEvent(chanid, +@@ -551,7 +555,9 @@ + starttime.setTime_t(tmp - utc_offset, Qt::LocalTime); + } + +- EITFixUp::TimeFix(starttime); ++ // fix starttime only if the duration is a multiple of a minute ++ if (!(event.length % 60)) ++ EITFixUp::TimeFix(starttime); + QDateTime endtime = starttime.addSecs(event.length); + + desc_list_t list = MPEGDescriptor::Parse(event.desc, event.desc_length); +@@ -693,6 +699,20 @@ // United Kingdom fix[ 9018U << 16] = EITFixUp::kFixUK; @@ -28824,7 +29006,7 @@ // ComHem Sweeden fix[40999U << 16 ] = EITFixUp::kFixComHem; -@@ -814,20 +828,24 @@ +@@ -814,20 +834,24 @@ EITFixUp::kEFixForceISO8859_15; // On transport 10008 only following channels need fixing: fix[ 10008LL<<32 | 61441U << 16 | 53002] = // Tele 5 @@ -29086,7 +29268,7 @@ Index: mythtv/libs/libmythtv/mpeg/freesat_huffman.h =================================================================== --- mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 0) -+++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 20373) ++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.h (revision 20668) @@ -0,0 +1,12 @@ +#ifndef _FREESAT_HUFFMAN_H_ +#define _FREESAT_HUFFMAN_H_ @@ -29109,7 +29291,7 @@ Index: mythtv/libs/libmythtv/mpeg/freesat_tables.h =================================================================== --- mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 0) -+++ mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 20373) ++++ mythtv/libs/libmythtv/mpeg/freesat_tables.h (revision 20668) @@ -0,0 +1,4370 @@ +struct fsattab fsat_table[] = { + { 0x00000000, 2, 'T'}, @@ -33490,7 +33672,7 @@ Index: mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp =================================================================== --- mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 0) -+++ mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 20373) ++++ mythtv/libs/libmythtv/mpeg/freesat_huffman.cpp (revision 20668) @@ -0,0 +1,107 @@ +#include "freesat_huffman.h" + @@ -34124,6 +34306,18 @@ int get_nibble(const uint8_t *buf, int nibble_offset); int decode_rle(uint8_t *bitmap, int linesize, int w, int h, +Index: mythtv/libs/libmythtv/vsync.cpp +=================================================================== +--- mythtv/libs/libmythtv/vsync.cpp (revision 16468) ++++ mythtv/libs/libmythtv/vsync.cpp (working copy) +@@ -16,6 +16,7 @@ + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include <cstdlib> + #include <cstdio> + #include <cerrno> + #include <cmath> Index: mythtv/libs/libmythtv/dvbtypes.h =================================================================== --- mythtv/libs/libmythtv/dvbtypes.h (revision 16468) @@ -34238,7 +34432,12 @@ =================================================================== --- mythtv/libs/libmythtv/videooutbase.cpp (revision 16468) +++ mythtv/libs/libmythtv/videooutbase.cpp (working copy) -@@ -510,7 +510,7 @@ +@@ -1,3 +1,4 @@ ++#include <cstdlib> + #include <cmath> + + #include "videooutbase.h" +@@ -510,7 +511,7 @@ SetupDeinterlace(true, db_vdisp_profile->GetFallbackDeinterlacer()); } @@ -34247,7 +34446,7 @@ * \brief Change to the best deinterlacing method. */ void VideoOutput::BestDeint(void) -@@ -611,6 +611,8 @@ +@@ -611,6 +612,8 @@ db_vdisp_profile->SetInput(video_dim); SetVideoAspectRatio(aspect); @@ -34713,6 +34912,29 @@ } AnalogPane::AnalogPane() : +Index: mythtv/libs/libmythtv/eitfixup.h +=================================================================== +--- mythtv/libs/libmythtv/eitfixup.h (revision 16468) ++++ mythtv/libs/libmythtv/eitfixup.h (working copy) +@@ -55,12 +55,16 @@ + + void Fix(DBEvent &event) const; + ++ /** Corrects starttime to the multiple of a minute. ++ * Used for providers who fail to handle leap seconds timely. Changes the ++ * starttime not more than 3 seconds. Sshould only be used if the ++ * duration is the multiple of a minute. */ + static void TimeFix(QDateTime &dt) + { + int secs = dt.time().second(); +- if (secs < 5) ++ if (secs < 4) + dt = dt.addSecs(-secs); +- if (secs > 55) ++ if (secs > 56) + dt = dt.addSecs(60 - secs); + } + Index: mythtv/libs/libmythtv/progfind.cpp =================================================================== --- mythtv/libs/libmythtv/progfind.cpp (revision 16468) @@ -35379,7 +35601,7 @@ Index: mythtv/libs/libavcodec/rectangle.h =================================================================== --- mythtv/libs/libavcodec/rectangle.h (revision 0) -+++ mythtv/libs/libavcodec/rectangle.h (revision 20373) ++++ mythtv/libs/libavcodec/rectangle.h (revision 20668) @@ -0,0 +1,121 @@ +/* + * rectangle filling function @@ -35604,7 +35826,7 @@ Index: mythtv/libs/libavcodec/i386/h264_i386.h =================================================================== --- mythtv/libs/libavcodec/i386/h264_i386.h (revision 0) -+++ mythtv/libs/libavcodec/i386/h264_i386.h (revision 20373) ++++ mythtv/libs/libavcodec/i386/h264_i386.h (revision 20668) @@ -0,0 +1,144 @@ +/* + * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder @@ -40410,6 +40632,405 @@ mingw:SOURCES -= audio.c + +include ( ../libs-targetfix.pro ) +Index: mythtv/libs/libmyth/audiopulseutil.h +=================================================================== +--- mythtv/libs/libmyth/audiopulseutil.h (revision 0) ++++ mythtv/libs/libmyth/audiopulseutil.h (revision 20668) +@@ -0,0 +1,6 @@ ++#include "mythexp.h" ++ ++MPUBLIC bool pulseaudio_suspend(void); ++MPUBLIC bool pulseaudio_unsuspend(void); ++MPUBLIC int pulseaudio_handle_startup(void); ++MPUBLIC int pulseaudio_handle_teardown(void); +Index: mythtv/libs/libmyth/audiopulseutil.cpp +=================================================================== +--- mythtv/libs/libmyth/audiopulseutil.cpp (revision 0) ++++ mythtv/libs/libmyth/audiopulseutil.cpp (revision 20668) +@@ -0,0 +1,383 @@ ++/*** ++ * This file was part of PulseAudio, the license has been upgraded to GPL v2 ++ * or later as per the LGPL grant this was originally distributed under. ++ * ++ * Copyright 2004-2006 Lennart Poettering ++ * ++ * MythTV 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include "audiopulseutil.h" ++#include "util.h" // for IsPulseAudioRunning() ++#include "exitcodes.h" ++#include "mythcontext.h" ++ ++#ifdef USING_PULSE ++ ++#include <sys/types.h> ++#include <sys/wait.h> ++ ++#include <signal.h> ++#include <string.h> ++#include <errno.h> ++#include <unistd.h> ++#include <assert.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <limits.h> ++#include <getopt.h> ++#include <locale.h> ++ ++#ifdef __linux__ ++#include <sys/prctl.h> ++#endif ++ ++#include <pulse/pulseaudio.h> ++ ++#include <qthread.h> ++#include <qmutex.h> ++#include <qwaitcondition.h> ++ ++#define BUFSIZE 1024 ++ ++#define LOC QString("AudioPulseUtil: ") ++#define LOC_WARN QString("AudioPulseUtil, Warning: ") ++#define LOC_ERR QString("AudioPulseUtil, Error: ") ++ ++enum pa_values { ++ kPA_undefined = -1, ++ kPA_suspended = +0, ++ kPA_not_suspended_remote_server = +1, ++ kPA_not_suspended_error = +2, ++ kPA_not_suspended_success = +3, ++ kPA_unsuspended_error = +4, ++ kPA_unsuspended_success = +5, ++}; ++ ++static pa_context *pau_context = NULL; ++static pa_mainloop_api *pau_mainloop_api = NULL; ++static QMutex pau_lock; ++static QWaitCondition pau_wait; ++static int pau_value = kPA_undefined; ++ ++static void pau_set_value(int new_value) ++{ ++ QMutexLocker ml(&pau_lock); ++ pau_value = new_value; ++ pau_wait.wakeAll(); ++} ++ ++static void pau_quit(int ret) ++{ ++ if (pau_mainloop_api) ++ pau_mainloop_api->quit(pau_mainloop_api, ret); ++} ++ ++static void pau_context_drain_complete(pa_context *c, void *userdata) ++{ ++ if (c) ++ pa_context_disconnect(c); ++} ++ ++static void pau_drain(void) ++{ ++ if (!pau_context) ++ return; ++ ++ pa_operation *operation = pa_context_drain(pau_context, pau_context_drain_complete, NULL); ++ if (!operation) ++ pa_context_disconnect(pau_context); ++ else ++ pa_operation_unref(operation); ++} ++ ++static void pau_suspend_complete(pa_context *c, int success, void *userdata) ++{ ++ if (!success) ++ { ++ if (!c) ++ return; ++ ++ VERBOSE(VB_IMPORTANT, LOC_ERR + QString("Failure to suspend: %1") ++ .arg(pa_strerror(pa_context_errno(c)))); ++ ++ pau_set_value(kPA_not_suspended_error); ++ ++ return; ++ } ++ ++ { ++ QMutexLocker ml(&pau_lock); ++ if (kPA_suspended == pau_value) ++ return; ++ } ++ ++ VERBOSE(VB_GENERAL, LOC + "Suspend Success"); ++ ++ pau_set_value(kPA_suspended); ++} ++ ++static void pau_resume_complete(pa_context *c, int success, void *userdata) ++{ ++ static int n = 0; ++ ++ n++; ++ ++ if (!success) ++ { ++ if (!c) ++ return; ++ ++ VERBOSE(VB_IMPORTANT, LOC_ERR + QString("Failure to resume: %1") ++ .arg(pa_strerror(pa_context_errno(c)))); ++ ++ pau_set_value(kPA_unsuspended_error); ++ ++ return; ++ } ++ ++ if (n >= 2) ++ pau_drain(); /* drain and quit */ ++ ++ { ++ QMutexLocker ml(&pau_lock); ++ if (kPA_unsuspended_success == pau_value) ++ return; ++ } ++ ++ VERBOSE(VB_GENERAL, LOC + "Resume Success"); ++ ++ pau_set_value(kPA_unsuspended_success); ++} ++ ++static void pau_context_state_callback(pa_context *c, void *userdata) ++{ ++ if (!c) ++ return; ++ ++ switch (pa_context_get_state(c)) ++ { ++ case PA_CONTEXT_CONNECTING: ++ case PA_CONTEXT_AUTHORIZING: ++ case PA_CONTEXT_SETTING_NAME: ++ break; ++ ++ case PA_CONTEXT_READY: ++ if (pa_context_is_local(c)) ++ { ++ pa_operation *operation_sink = ++ pa_context_suspend_sink_by_index( ++ c, PA_INVALID_INDEX, 1, pau_suspend_complete, NULL); ++ pa_operation_unref(operation_sink); ++ ++ pa_operation *operation_source = ++ pa_context_suspend_source_by_index( ++ c, PA_INVALID_INDEX, 1, pau_suspend_complete, NULL); ++ pa_operation_unref(operation_source); ++ } ++ else ++ { ++ VERBOSE(VB_IMPORTANT, LOC_ERR + ++ "Sound server is not local, can not suspend."); ++ ++ pau_set_value(kPA_not_suspended_remote_server); ++ } ++ ++ break; ++ ++ case PA_CONTEXT_TERMINATED: ++ pau_quit(0); ++ break; ++ ++ case PA_CONTEXT_FAILED: ++ default: ++ VERBOSE(VB_IMPORTANT, LOC_WARN + ++ "Can not connect to sound server, can not suspend." + ++ QString("\n\t\t\t%1") ++ .arg(pa_strerror(pa_context_errno(c)))); ++ ++ pau_set_value(kPA_not_suspended_error); ++ ++ if (pau_context) ++ { ++ pa_context_unref(pau_context); ++ pau_context = NULL; ++ } ++ ++ break; ++ } ++} ++ ++void pau_pulseaudio_suspend_internal(void) ++{ ++ pa_mainloop* m = NULL; ++ int ret = 1; ++ char *server = NULL; ++ const char *bn = "mythtv"; ++ ++ if (!(m = pa_mainloop_new())) ++ { ++ VERBOSE(VB_IMPORTANT, LOC_ERR + "pa_mainloop_new() failed."); ++ goto quit; ++ } ++ ++ pau_mainloop_api = pa_mainloop_get_api(m); ++ if (!pau_mainloop_api) ++ goto quit; ++ ++ if (pa_signal_init(pau_mainloop_api) != 0) ++ goto quit; ++ ++ if (!(pau_context = pa_context_new(pau_mainloop_api, bn))) ++ { ++ VERBOSE(VB_IMPORTANT, LOC_ERR + "pa_context_new() failed."); ++ goto quit; ++ } ++ ++ pa_context_set_state_callback(pau_context, pau_context_state_callback, NULL); ++ pa_context_connect(pau_context, server, PA_CONTEXT_NOAUTOSPAWN, NULL); ++ ++ if (pa_mainloop_run(m, &ret) < 0) ++ { ++ VERBOSE(VB_IMPORTANT, LOC_ERR + "pa_mainloop_run() failed.\n"); ++ goto quit; ++ } ++ ++quit: ++ if (pau_context) ++ pa_context_unref(pau_context); ++ ++ if (m) { ++ pa_signal_done(); ++ pa_mainloop_free(m); ++ } ++ ++ pa_xfree(server); ++} ++ ++class PAThread : public QThread ++{ ++ public: ++ void run(void) ++ { ++ pau_pulseaudio_suspend_internal(); ++ } ++}; ++ ++/// \returns true if successful ++bool pulseaudio_suspend(void) ++{ ++ QThread *t = new PAThread(); ++ t->start(); ++ ++ QMutexLocker ml(&pau_lock); ++ while (kPA_undefined == pau_value) ++ pau_wait.wait(&pau_lock); ++ ++ return kPA_suspended == pau_value; ++} ++ ++/// \returns true if successful ++bool pulseaudio_unsuspend(void) ++{ ++ if (!pau_context) ++ { ++ pau_quit(0); ++ return false; ++ } ++ ++ if (pa_context_is_local(pau_context)) ++ { ++ pa_operation *operation_sink = ++ pa_context_suspend_sink_by_index( ++ pau_context, PA_INVALID_INDEX, 0, pau_resume_complete, NULL); ++ pa_operation_unref(operation_sink); ++ ++ pa_operation *operation_source = ++ pa_context_suspend_source_by_index( ++ pau_context, PA_INVALID_INDEX, 0, pau_resume_complete, NULL); ++ pa_operation_unref(operation_source); ++ ++ QMutexLocker ml(&pau_lock); ++ while ((kPA_unsuspended_error != pau_value) && ++ (kPA_unsuspended_success != pau_value)) ++ { ++ pau_wait.wait(&pau_lock); ++ } ++ ++ return kPA_unsuspended_success == pau_value; ++ } ++ else ++ { ++ pau_drain(); ++ } ++ ++ return false; ++} ++ ++#endif // USING_PULSE ++ ++int pulseaudio_handle_startup(void) ++{ ++#ifdef USING_PULSE ++ if (getenv("EXPERIMENTALLY_ALLOW_PULSE_AUDIO")) ++ { ++ VERBOSE(VB_IMPORTANT, "WARNING: "); ++ VERBOSE(VB_IMPORTANT, "WARNING: ***Pulse Audio is running!!!!***"); ++ VERBOSE(VB_IMPORTANT, "WARNING: "); ++ VERBOSE(VB_IMPORTANT, "WARNING: You have told MythTV to ignore it."); ++ VERBOSE(VB_IMPORTANT, "WARNING: "); ++ } ++ else if (IsPulseAudioRunning() && !pulseaudio_suspend()) ++ { ++ VERBOSE(VB_IMPORTANT, "ERROR: ***Pulse Audio is running!!!!***"); ++ VERBOSE(VB_IMPORTANT, ++ "ERROR: But MythTV was not able to suspend it. EXITING!"); ++ ++ return GENERIC_EXIT_NOT_OK; ++ } ++#else ++ if (IsPulseAudioRunning()) ++ { ++ VERBOSE(VB_IMPORTANT, "ERROR: ***Pulse Audio is running!!!!***"); ++ VERBOSE(VB_IMPORTANT, "ERROR: But MythTV has not been compiled " ++ "with Pulse Audio disabling support. EXITING!"); ++ return GENERIC_EXIT_NOT_OK; ++ } ++#endif ++ ++ return GENERIC_EXIT_OK; ++} ++ ++int pulseaudio_handle_teardown(void) ++{ ++#ifdef USING_PULSE ++ if (getenv("EXPERIMENTALLY_ALLOW_PULSE_AUDIO")) ++ return GENERIC_EXIT_OK; ++ ++ { ++ QMutexLocker ml(&pau_lock); ++ if (kPA_suspended != pau_value) ++ return GENERIC_EXIT_OK; ++ } ++ ++ if (!pulseaudio_unsuspend()) ++ { ++ VERBOSE(VB_IMPORTANT, "ERROR: Encountered error re-enabling pulse audio"); ++ } ++#endif ++ ++ return GENERIC_EXIT_OK; ++} Index: mythtv/libs/libmyth/mythcdrom.cpp =================================================================== --- mythtv/libs/libmyth/mythcdrom.cpp (revision 16468) @@ -40556,6 +41177,20 @@ QString aString; int mask = 0; if (0 && GetLEDMask) +Index: mythtv/libs/libmyth/mythmediamonitor.h +=================================================================== +--- mythtv/libs/libmyth/mythmediamonitor.h (revision 16468) ++++ mythtv/libs/libmyth/mythmediamonitor.h (working copy) +@@ -75,7 +75,8 @@ + static QString defaultCDdevice(); + static QString defaultVCDdevice(); + static QString defaultDVDdevice(); +- static QString defaultWriter(); ++ static QString defaultCDWriter(); ++ static QString defaultDVDWriter(); + + virtual QStringList GetCDROMBlockDevices(void) = 0; + Index: mythtv/libs/libmyth/mythcdrom.h =================================================================== --- mythtv/libs/libmyth/mythcdrom.h (revision 16468) @@ -40587,7 +41222,16 @@ # ifdef CONFIG_CYGWIN # include <sys/statfs.h> # else // if !CONFIG_CYGWIN -@@ -293,10 +296,11 @@ +@@ -62,6 +65,8 @@ + #include "jsmenuevent.h" + #endif + ++#include "mythconfig.h" // for CONFIG_DARWIN ++ + /** \fn mythCurrentDateTime() + * \brief Returns the current QDateTime object, stripped of its msec component + */ +@@ -293,10 +298,11 @@ return GENERIC_EXIT_NOT_OK; } @@ -40600,6 +41244,25 @@ usleep(100000); } } +@@ -955,3 +961,18 @@ + return approx_size; + #endif + } ++ ++bool IsPulseAudioRunning(void) ++{ ++#if defined(CONFIG_DARWIN) || (__FreeBSD__) || defined(__OpenBSD__) ++ const char *command = "ps -ax | grep -i pulseaudio | grep -v grep > /dev/null"; ++#else ++ const char *command = "ps -ae | grep pulseaudio > /dev/null"; ++#endif ++ bool res = myth_system(command, ++ MYTH_SYSTEM_DONT_BLOCK_LIRC | ++ MYTH_SYSTEM_DONT_BLOCK_JOYSTICK_MENU); ++ return !res; ++} ++ ++/* vim: set expandtab tabstop=4 shiftwidth=4: */ Index: mythtv/libs/libmyth/compat.h =================================================================== --- mythtv/libs/libmyth/compat.h (revision 16468) @@ -41819,6 +42482,20 @@ } MediaError MythMediaDevice::lock() +Index: mythtv/libs/libmyth/util.h +=================================================================== +--- mythtv/libs/libmyth/util.h (revision 16468) ++++ mythtv/libs/libmyth/util.h (working copy) +@@ -84,6 +84,9 @@ + + MPUBLIC double MythGetPixelAspectRatio(void); + ++/// Is A/V Sync destruction daemon is running on this host? ++MPUBLIC bool IsPulseAudioRunning(void); ++ + // CPU Tick timing function + #ifdef MMX + #ifdef _WIN32 Index: mythtv/libs/libmyth/screensaver-x11.cpp =================================================================== --- mythtv/libs/libmyth/screensaver-x11.cpp (revision 16468) @@ -41867,7 +42544,23 @@ =================================================================== --- mythtv/libs/libmyth/libmyth.pro (revision 16468) +++ mythtv/libs/libmyth/libmyth.pro (working copy) -@@ -83,6 +83,10 @@ +@@ -26,6 +26,7 @@ + HEADERS += volumebase.h volumecontrol.h virtualkeyboard.h visual.h xmlparse.h + HEADERS += mythhdd.h mythcdrom.h storagegroup.h dbutil.h + HEADERS += compat.h ++HEADERS += audiopulseutil.h + + SOURCES += audiooutput.cpp audiooutputbase.cpp audiooutputnull.cpp + SOURCES += audiooutputdigitalencoder.cpp +@@ -42,6 +43,7 @@ + SOURCES += uilistbtntype.cpp uitypes.cpp util.cpp util-x11.cpp + SOURCES += volumebase.cpp volumecontrol.cpp virtualkeyboard.cpp xmlparse.cpp + SOURCES += mythhdd.cpp mythcdrom.cpp storagegroup.cpp dbutil.cpp ++SOURCES += audiopulseutil.cpp + + INCLUDEPATH += ../libmythsamplerate ../libmythsoundtouch ../libmythfreesurround + INCLUDEPATH += ../libavcodec ../libavutil +@@ -83,12 +85,21 @@ inc2.files = $${inc.files} @@ -41878,7 +42571,18 @@ using_oss { DEFINES += USING_OSS SOURCES += audiooutputoss.cpp -@@ -107,9 +111,6 @@ + HEADERS += audiooutputoss.h + } + ++using_pulse { ++ DEFINES += USING_PULSE ++ LIBS += $$PULSE_LIBS ++} ++ + unix:!cygwin { + SOURCES += mediamonitor-unix.cpp + HEADERS += mediamonitor-unix.h +@@ -107,9 +118,6 @@ LIBS += -lpthread @@ -41888,7 +42592,7 @@ LIBS -= -lmythui-$$LIBVERSION -lmythupnp-$$LIBVERSION LIBS += -L. -lmythui-bootstrap -lmythupnp-bootstrap POST_TARGETDEPS += libmythui-bootstrap.a libmythupnp-bootstrap.a -@@ -241,3 +242,5 @@ +@@ -241,3 +249,5 @@ contains( CONFIG_LIBFFTW3, yes ) { LIBS += -lfftw3f } @@ -41906,7 +42610,15 @@ #include "mythcontext.h" #include "mythdialogs.h" #include "mythconfig.h" -@@ -81,8 +82,13 @@ +@@ -74,15 +75,26 @@ + void MediaMonitor::SetCDSpeed(const char *device, int speed) + { + MediaMonitor *mon = GetMediaMonitor(); +- if (mon != NULL) ++ if (mon) + { + MythMediaDevice *pMedia = mon->GetMedia(device); + if (pMedia && mon->ValidateAndLock(pMedia)) { pMedia->setSpeed(speed); mon->Unlock(pMedia); @@ -41915,11 +42627,41 @@ } + + MythCDROM *cd = MythCDROM::get(NULL, device, false, false); -+ cd->setSpeed(device, speed); -+ delete cd; ++ if (cd) ++ { ++ cd->setSpeed(device, speed); ++ delete cd; ++ } ++ ++ VERBOSE(VB_MEDIA, QString("MediaMonitor::setSpeed(%1) " ++ "- Cannot find/create CDROM?") + device); } // When ejecting one of multiple devices, present a nice name to the user +@@ -690,13 +702,22 @@ + tr("Select a DVD drive"), "/dev/dvd"); + } + ++/** ++ * \brief CDWriterDeviceLocation, user-selected drive, or /dev/cdrom ++ */ ++QString MediaMonitor::defaultCDWriter() ++{ ++ return defaultDevice("CDWriterDeviceLocation", ++ tr("Select a CD writer"), "/dev/cdrom"); ++} ++ + /** + * \brief MythArchiveDVDLocation, user-selected drive, or /dev/dvd + * + * This should also look for drives with blanks or RWs in them, + * but Nigel hasn't worked out how to do this tidily (yet). + */ +-QString MediaMonitor::defaultWriter() ++QString MediaMonitor::defaultDVDWriter() + { + QString device = defaultDevice("MythArchiveDVDLocation", + tr("Select a DVD writer"), "/dev/dvd"); Index: mythtv/libs/libmyth/mythcdrom-linux.cpp =================================================================== --- mythtv/libs/libmyth/mythcdrom-linux.cpp (revision 16468) @@ -44274,6 +45016,98 @@ } + +include ( ../libs-targetfix.pro ) +Index: mythtv/programs/mythfrontend/playbackbox.cpp +=================================================================== +--- mythtv/programs/mythfrontend/playbackbox.cpp (revision 16468) ++++ mythtv/programs/mythfrontend/playbackbox.cpp (working copy) +@@ -1059,14 +1059,14 @@ + + // Centre preview in the y axis + if (temp.height() < blackholeBounds.height()) +- pixmap_y = blackholeBounds.y() + ++ pixmap_y = blackholeBounds.y() + + (blackholeBounds.height() - temp.height()) / 2; + else + pixmap_y = blackholeBounds.y(); + + // Centre preview in the x axis + if (temp.width() < blackholeBounds.width()) +- pixmap_x = blackholeBounds.x() + ++ pixmap_x = blackholeBounds.x() + + (blackholeBounds.width() - temp.width()) / 2; + else + pixmap_x = blackholeBounds.x(); +@@ -1191,14 +1191,14 @@ + + // Centre video in the y axis + if (img.height() < blackholeBounds.height()) +- video_y = blackholeBounds.y() + ++ video_y = blackholeBounds.y() + + (blackholeBounds.height() - img.height()) / 2; + else + video_y = blackholeBounds.y(); + + // Centre video in the x axis + if (img.width() < blackholeBounds.width()) +- video_x = blackholeBounds.x() + ++ video_x = blackholeBounds.x() + + (blackholeBounds.width() - img.width()) / 2; + else + video_x = blackholeBounds.x(); +@@ -1679,7 +1679,7 @@ + paintSkipUpdate = false; + update(drawTotalBounds); + } +- else ++ else + { + progIndex = 0; + +@@ -1701,7 +1701,7 @@ + paintSkipUpdate = false; + update(drawTotalBounds); + } +- else ++ else + { + int progCount = progLists[titleList[titleIndex].lower()].count(); + +@@ -1721,7 +1721,7 @@ + { + if (inTitle) + pageTop(); +- else ++ else + { + progIndex = progLists[titleList[titleIndex].lower()].count() - 1; + +@@ -2066,7 +2066,7 @@ + } + + ProgramInfo *p; +- p = progLists[watchGroupLabel].first(); ++ p = progLists[watchGroupLabel].first(); + while (p) + { + int recid = p->recordid; +@@ -2703,7 +2703,7 @@ + return false; + } + +- if (rec->filesize == 0) ++ if ((rec->filesize == 0) && (rec->GetFilesize() == 0)) + { + VERBOSE(VB_IMPORTANT, + QString("PlaybackBox::play(): Error, %1 is zero-bytes in size") +@@ -3660,7 +3660,7 @@ + return; + + curitem->ForgetHistory(); +-} ++} + + void PlaybackBox::doJobQueueJob(int jobType, int jobFlags) + { Index: mythtv/programs/mythfrontend/media_settings.xml =================================================================== --- mythtv/programs/mythfrontend/media_settings.xml (revision 16468) @@ -44355,6 +45189,40 @@ <action>TV_CUSTOM_RECORD</action> </button> +Index: mythtv/programs/mythfrontend/main.cpp +=================================================================== +--- mythtv/programs/mythfrontend/main.cpp (revision 16468) ++++ mythtv/programs/mythfrontend/main.cpp (working copy) +@@ -58,6 +58,7 @@ + #include "mythscreenstack.h" + #include "mythmainwindow.h" + #include "mythappearance.h" ++#include "audiopulseutil.h" + + #define NO_EXIT 0 + #define QUIT 1 +@@ -1321,6 +1322,10 @@ + } + } + ++ int pa_ret = pulseaudio_handle_startup(); ++ if (pa_ret != GENERIC_EXIT_OK) ++ return pa_ret; ++ + if (logfile != "") + { + if (log_rotate(1) < 0) +@@ -1548,6 +1553,10 @@ + VERBOSE(VB_GENERAL, "Deleting UPnP client..."); + delete g_pUPnp; + ++ pa_ret = pulseaudio_handle_teardown(); ++ if (GENERIC_EXIT_OK != pa_ret) ++ return pa_ret; ++ + return FRONTEND_EXIT_OK; + + } Index: mythtv/programs/mythfrontend/mainmenu.xml =================================================================== --- mythtv/programs/mythfrontend/mainmenu.xml (revision 16468) @@ -44428,6 +45296,18 @@ <action>PLUGIN mythzoneminder</action> <depends>mythzoneminder</depends> </button> +Index: mythtv/programs/mythfrontend/mythfrontend.pro +=================================================================== +--- mythtv/programs/mythfrontend/mythfrontend.pro (revision 16468) ++++ mythtv/programs/mythfrontend/mythfrontend.pro (working copy) +@@ -61,6 +61,7 @@ + using_xrandr:DEFINES += USING_XRANDR + using_opengl_vsync:DEFINES += USING_OPENGL_VSYNC + ++using_pulse:DEFINES += USING_PULSE + using_alsa:DEFINES += USING_ALSA + using_arts:DEFINES += USING_ARTS + using_jack:DEFINES += USING_JACK Index: mythtv/programs/mythfrontend/recpriorities_settings.xml =================================================================== --- mythtv/programs/mythfrontend/recpriorities_settings.xml (revision 16468) @@ -44557,6 +45437,75 @@ } enum MPFDisplayMask { +Index: mythtv/programs/mythcommflag/main.cpp +=================================================================== +--- mythtv/programs/mythcommflag/main.cpp (revision 16468) ++++ mythtv/programs/mythcommflag/main.cpp (working copy) +@@ -59,7 +59,7 @@ + program_info->recstartts = QDateTime::currentDateTime().addSecs( -180 * 60); + program_info->recendts = QDateTime::currentDateTime().addSecs(-1); + program_info->isVideo = true; +- program_info->pathname = filename; ++ program_info->pathname = QFileInfo(filename).absFilePath(); + + RingBuffer *tmprbuf = new RingBuffer(filename, false); + if (!tmprbuf) +@@ -681,7 +681,7 @@ + "Missing or invalid parameters for --chanid option"); + return COMMFLAG_EXIT_INVALID_CHANID; + } +- ++ + chanid += a.argv()[++argpos]; + } + else if (!strcmp(a.argv()[argpos],"-s") || +@@ -694,7 +694,7 @@ + "Missing or invalid parameters for --starttime option"); + return COMMFLAG_EXIT_INVALID_STARTTIME; + } +- ++ + starttime += a.argv()[++argpos]; + } + else if (!strcmp(a.argv()[argpos],"-f") || +@@ -740,7 +740,7 @@ + cerr << "Missing or invalid parameter for --allstart\n"; + return COMMFLAG_EXIT_INVALID_STARTTIME; + } +- ++ + allStart = a.argv()[++argpos]; + } + else if (!strcmp(a.argv()[argpos], "--allend")) +@@ -751,7 +751,7 @@ + cerr << "Missing or invalid parameter for --allend\n"; + return COMMFLAG_EXIT_INVALID_STARTTIME; + } +- ++ + allEnd = a.argv()[++argpos]; + } + else if (!strcmp(a.argv()[argpos], "--quiet")) +@@ -849,8 +849,8 @@ + cerr << "Invalid or missing argument to " + "-O/--override-setting option\n"; + return BACKEND_EXIT_INVALID_CMDLINE; +- } +- ++ } ++ + QStringList pairs = QStringList::split(",", tmpArg); + for (unsigned int index = 0; index < pairs.size(); ++index) + { +@@ -863,7 +863,7 @@ + } + } + else +- { ++ { + cerr << "Invalid or missing argument to -O/--override-setting " + "option\n"; + return GENERIC_EXIT_INVALID_CMDLINE; Index: mythtv/programs/mythbackend/upnpcdsvideo.h =================================================================== --- mythtv/programs/mythbackend/upnpcdsvideo.h (revision 16468) @@ -44834,7 +45783,15 @@ =================================================================== --- mythtv/programs/mythbackend/scheduler.cpp (revision 16468) +++ mythtv/programs/mythbackend/scheduler.cpp (working copy) -@@ -1303,7 +1303,7 @@ +@@ -1242,6 +1242,7 @@ + // Restore the old status for some select cases that won't record. + if (p->recstatus != rsWillRecord && + p->oldrecstatus != rsUnknown && ++ p->oldrecstatus != rsNotListed && + !p->reactivate) + p->recstatus = p->oldrecstatus; + +@@ -1303,7 +1304,7 @@ if (next_record == nextRecMap[recid]) continue; @@ -44843,7 +45800,7 @@ { subquery.prepare("UPDATE record " "SET next_record = '0000-00-00T00:00:00' " -@@ -2030,6 +2030,13 @@ +@@ -2030,6 +2031,13 @@ "be $time if command " "set.\'"); @@ -44857,7 +45814,7 @@ if (wakeup_timeformat == "time_t") { QString time_ts; -@@ -2045,8 +2052,14 @@ +@@ -2045,8 +2053,14 @@ setwakeup_cmd); // now run the command to set the wakeup time @@ -44874,7 +45831,7 @@ } // tell anyone who is listening the master server is going down now -@@ -2065,7 +2078,10 @@ +@@ -2065,7 +2079,10 @@ "this computer :-\n\t\t\t\t\t\t") + halt_cmd); // and now shutdown myself @@ -44886,6 +45843,17 @@ } // If we make it here then either the shutdown failed +@@ -2795,7 +2812,9 @@ + ProgramInfo *p = new ProgramInfo; + p->reactivate = result.value(38).toInt(); + p->oldrecstatus = RecStatusType(result.value(37).toInt()); +- if (p->oldrecstatus == rsAborted || p->reactivate) ++ if (p->oldrecstatus == rsAborted || ++ p->oldrecstatus == rsNotListed || ++ p->reactivate) + p->recstatus = rsUnknown; + else + p->recstatus = p->oldrecstatus; Index: mythtv/programs/mythbackend/upnpmedia.cpp =================================================================== --- mythtv/programs/mythbackend/upnpmedia.cpp (revision 16468) @@ -44913,6 +45881,47 @@ for (QFileInfoListIterator it(*List); it; ++it) { QFileInfo Info(*it.current()); +Index: mythtv/programs/mythbackend/autoexpire.cpp +=================================================================== +--- mythtv/programs/mythbackend/autoexpire.cpp (revision 16468) ++++ mythtv/programs/mythbackend/autoexpire.cpp (working copy) +@@ -36,7 +36,8 @@ + #include "backendutil.h" + #include "compat.h" + +-#define LOC QString("AutoExpire: ") ++#define LOC QString("AutoExpire: ") ++#define LOC_ERR QString("AutoExpire Error: ") + + extern AutoExpire *expirer; + +@@ -423,6 +424,26 @@ + .arg(fsit->usedSpaceKB / 1024.0 / 1024.0, 7, 'f', 1) + .arg(fsit->freeSpaceKB / 1024.0 / 1024.0, 7, 'f', 1)); + ++ if ((fsit->totalSpaceKB == -1) || (fsit->usedSpaceKB == -1)) ++ { ++ VERBOSE(VB_FILE, LOC_ERR + QString("fsID #%1 has invalid info, " ++ "AutoExpire can not run for this filesystem. " ++ "Continuing on to next...").arg(fsit->fsID)); ++ VERBOSE(VB_FILE, QString("Directories on filesystem ID %1:") ++ .arg(fsit->fsID)); ++ vector<FileSystemInfo>::iterator fsit2; ++ for (fsit2 = fsInfos.begin(); fsit2 != fsInfos.end(); fsit2++) ++ { ++ if (fsit2->fsID == fsit->fsID) ++ { ++ VERBOSE(VB_FILE, QString(" %1:%2") ++ .arg(fsit2->hostname).arg(fsit2->directory)); ++ } ++ } ++ ++ continue; ++ } ++ + if (truncateMap.contains(fsit->fsID)) + { + VERBOSE(VB_FILE, QString( Index: mythtv/programs/mythbackend/backendutil.cpp =================================================================== --- mythtv/programs/mythbackend/backendutil.cpp (revision 16468) @@ -45078,7 +46087,26 @@ =================================================================== --- mythtv/programs/mythtv/main.cpp (revision 16468) +++ mythtv/programs/mythtv/main.cpp (working copy) -@@ -287,7 +287,7 @@ +@@ -14,6 +14,7 @@ + #include "libmyth/mythdbcon.h" + #include "libmyth/mythdialogs.h" + #include "libmyth/compat.h" ++#include "audiopulseutil.h" + + #include <iostream> + using namespace std; +@@ -251,6 +252,10 @@ + + gContext->LoadQtConfig(); + ++ int pa_ret = pulseaudio_handle_startup(); ++ if (pa_ret != GENERIC_EXIT_OK) ++ return pa_ret; ++ + #if defined(Q_OS_MACX) + // Mac OS X doesn't define the AudioOutputDevice setting + #else +@@ -287,7 +292,7 @@ pginfo->isVideo = true; // RingBuffer doesn't like relative pathnames @@ -45087,6 +46115,40 @@ pginfo->pathname.prepend(QDir::currentDirPath() + '/'); } +@@ -303,6 +308,10 @@ + } + delete gContext; + ++ pa_ret = pulseaudio_handle_teardown(); ++ if (GENERIC_EXIT_OK != pa_ret) ++ return pa_ret; ++ + return TV_EXIT_OK; + } + +Index: mythtv/programs/mythtv/mythtv.pro +=================================================================== +--- mythtv/programs/mythtv/mythtv.pro (revision 16468) ++++ mythtv/programs/mythtv/mythtv.pro (working copy) +@@ -20,3 +20,18 @@ + } + + using_x11:DEFINES += USING_X11 ++using_xv:DEFINES += USING_XV ++using_ivtv:DEFINES += USING_IVTV ++using_xvmc:DEFINES += USING_XVMC ++using_xvmc_vld:DEFINES += USING_XVMC_VLD ++using_xrandr:DEFINES += USING_XRANDR ++using_opengl_vsync:DEFINES += USING_OPENGL_VSYNC ++using_opengl_video:DEFINES += USING_OPENGL_VIDEO ++using_vdpau:DEFINES += USING_VDPAU ++ ++using_pulse:DEFINES += USING_PULSE ++using_alsa:DEFINES += USING_ALSA ++using_arts:DEFINES += USING_ARTS ++using_jack:DEFINES += USING_JACK ++using_oss: DEFINES += USING_OSS ++macx: DEFINES += USING_COREAUDIO Index: mythtv/programs/mythfilldatabase/filldata.cpp =================================================================== --- mythtv/programs/mythfilldatabase/filldata.cpp (revision 16468) @@ -45549,10 +46611,25 @@ # construct linking path LOCAL_LIBDIR_X11 = +@@ -109,6 +116,7 @@ + EXTRA_LIBS += $$CONFIG_AUDIO_ALSA_LIBS + EXTRA_LIBS += $$CONFIG_AUDIO_ARTS_LIBS + EXTRA_LIBS += $$CONFIG_AUDIO_JACK_LIBS ++EXTRA_LIBS += $$CONFIG_AUDIO_PULSE_LIBS + EXTRA_LIBS += $$CONFIG_FIREWIRE_LIBS + EXTRA_LIBS += $$CONFIG_DIRECTFB_LIBS + +@@ -119,5 +127,6 @@ + EXTRA_LIBS += $$CONFIG_XVMC_LIBS + EXTRA_LIBS += $$CONFIG_OPENGL_LIBS + EXTRA_LIBS += $$FRIBIDI_LIBS ++using_pulse:EXTRA_LIBS += $$PULSE_LIBS + + LIRC_LIBS = $$CONFIG_LIRC_LIBS Index: mythtv/contrib/Win32/build/mythtvsetup.iss =================================================================== --- mythtv/contrib/Win32/build/mythtvsetup.iss (revision 0) -+++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 20373) ++++ mythtv/contrib/Win32/build/mythtvsetup.iss (revision 20668) @@ -0,0 +1,493 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! @@ -46056,7 +47133,7 @@ Index: mythtv/contrib/Win32/MythInstaller.bat =================================================================== --- mythtv/contrib/Win32/MythInstaller.bat (revision 0) -+++ mythtv/contrib/Win32/MythInstaller.bat (revision 20373) ++++ mythtv/contrib/Win32/MythInstaller.bat (revision 20668) @@ -0,0 +1,69 @@ +@rem = '--*-Perl-*-- +@rem @@ -46138,7 +47215,7 @@ Index: mythtv/contrib/Win32/run/mythfrontend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythfrontend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 20373) ++++ mythtv/contrib/Win32/run/mythfrontend.cmd (revision 20668) @@ -0,0 +1,57 @@ +@Echo off +:: @@ -46200,7 +47277,7 @@ Index: mythtv/contrib/Win32/run/mythbackend.cmd =================================================================== --- mythtv/contrib/Win32/run/mythbackend.cmd (revision 0) -+++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 20373) ++++ mythtv/contrib/Win32/run/mythbackend.cmd (revision 20668) @@ -0,0 +1,58 @@ +@Echo off +:: @@ -46327,16 +47404,67 @@ =================================================================== --- mythtv/contrib/channel_changers/6200ch.c (revision 16468) +++ mythtv/contrib/channel_changers/6200ch.c (working copy) -@@ -76,13 +76,14 @@ +@@ -34,8 +34,14 @@ + // WARNING: Please update firewiredevice.cpp when adding to this list. + + #define DCH3200_VENDOR_ID1 0x00001c11 ++#define DCH3200_VENDOR_ID2 0x00001cfb ++#define DCH3200_VENDOR_ID3 0x00001fc4 ++#define DCH3200_VENDOR_ID4 0x000023a3 + #define DCH3200_MODEL_ID1 0x0000d330 + ++#define DCH3416_VENDOR_ID1 0x00001e46 ++#define DCH3416_MODEL_ID1 0x0000b630 ++ + #define DCT3412_VENDOR_ID1 0x0000159a + #define DCT3412_MODEL_ID1 0x000034cb + +@@ -62,6 +68,7 @@ + #define DCT6200_VENDOR_ID13 0x00001aad + #define DCT6200_VENDOR_ID14 0x00000b06 + #define DCT6200_VENDOR_ID15 0x0000195e ++#define DCT6200_VENDOR_ID16 0x000010dc + #define DCT6200_SPEC_ID 0x00005068 + #define DCT6200_SW_VERSION 0x00010101 + #define DCT6200_MODEL_ID1 0x0000620a +@@ -76,13 +83,42 @@ #define DCT6416_VENDOR_ID2 0x00001a66 #define DCT6416_MODEL_ID1 0x0000646b -#define AVC1394_SUBUNIT_TYPE_6200 (9 << 19) /* uses a reserved subunit type */ ++#define QIP7100_VENDOR_ID1 0x00002374 ++#define QIP7100_MODEL_ID1 0x00008100 ++#define QIP7100_MODEL_ID2 0x00000001 + +-#define AVC1394_6200_COMMAND_CHANNEL 0x000007C00 /* 6200 subunit command */ ++#define MOT_UNKNOWN_VENDOR_ID1 0x04db ++#define MOT_UNKNOWN_VENDOR_ID2 0x0406 ++#define MOT_UNKNOWN_VENDOR_ID3 0x0ce5 ++#define MOT_UNKNOWN_VENDOR_ID4 0x111a ++#define MOT_UNKNOWN_VENDOR_ID5 0x1225 ++#define MOT_UNKNOWN_VENDOR_ID6 0x1404 ++#define MOT_UNKNOWN_VENDOR_ID7 0x1626 ++#define MOT_UNKNOWN_VENDOR_ID8 0x18c0 ++#define MOT_UNKNOWN_VENDOR_ID9 0x1ade ++#define MOT_UNKNOWN_VENDOR_ID10 0x1cfb ++#define MOT_UNKNOWN_VENDOR_ID11 0x2040 ++#define MOT_UNKNOWN_VENDOR_ID12 0x211e ++#define MOT_UNKNOWN_VENDOR_ID13 0x2180 ++#define MOT_UNKNOWN_VENDOR_ID14 0x2210 ++#define MOT_UNKNOWN_VENDOR_ID15 0x230b ++#define MOT_UNKNOWN_VENDOR_ID16 0x2375 ++#define MOT_UNKNOWN_VENDOR_ID17 0x2395 ++#define MOT_UNKNOWN_VENDOR_ID18 0x23a2 ++#define MOT_UNKNOWN_VENDOR_ID19 0x23ed ++#define MOT_UNKNOWN_VENDOR_ID20 0x23ee ++#define MOT_UNKNOWN_VENDOR_ID21 0x23a0 ++#define MOT_UNKNOWN_VENDOR_ID22 0x23a1 ++ +#define PACE_VENDOR_ID1 0x00005094 /* 550 & 779 */ ++#define PACE_VENDOR_ID2 0x00005094 /* unknown */ +#define PACE550_MODEL_ID1 0x00010551 +#define PACE779_MODEL_ID1 0x00010755 - --#define AVC1394_6200_COMMAND_CHANNEL 0x000007C00 /* 6200 subunit command */ ++ #define AVC1394_6200_OPERAND_SET 0x20 /* 6200 subunit command operand */ -#define CTL_CMD0 AVC1394_CTYPE_CONTROL | AVC1394_SUBUNIT_TYPE_6200 | \ @@ -46346,25 +47474,158 @@ AVC1394_6200_OPERAND_SET #define STARTING_NODE 1 /* skip 1394 nodes to avoid error msgs */ -@@ -240,7 +241,8 @@ +@@ -171,7 +207,7 @@ + + if (!handle) { + if (!errno) { +- fprintf(stderr, "Not Compatable!\n"); ++ fprintf(stderr, "Not Compatible!\n"); + } else { + perror("Couldn't get 1394 handle"); + fprintf(stderr, "Is ieee1394, driver, and raw1394 loaded?\n"); +@@ -218,9 +254,13 @@ + + // WARNING: Please update firewiredevice.cpp when adding to this list. + if ( ((dir.vendor_id == DCH3200_VENDOR_ID1) || +- (dir.vendor_id == DCT3412_VENDOR_ID1) || +- (dir.vendor_id == DCT3416_VENDOR_ID1) || +- (dir.vendor_id == DCT3416_VENDOR_ID2) || ++ (dir.vendor_id == DCH3200_VENDOR_ID2) || ++ (dir.vendor_id == DCH3200_VENDOR_ID3) || ++ (dir.vendor_id == DCH3200_VENDOR_ID4) || ++ (dir.vendor_id == DCH3416_VENDOR_ID1) || ++ (dir.vendor_id == DCT3412_VENDOR_ID1) || ++ (dir.vendor_id == DCT3416_VENDOR_ID1) || ++ (dir.vendor_id == DCT3416_VENDOR_ID2) || + (dir.vendor_id == DCT5100_VENDOR_ID1) || + (dir.vendor_id == DCT6200_VENDOR_ID1) || + (dir.vendor_id == DCT6200_VENDOR_ID2) || +@@ -237,11 +277,38 @@ + (dir.vendor_id == DCT6200_VENDOR_ID13) || + (dir.vendor_id == DCT6200_VENDOR_ID14) || + (dir.vendor_id == DCT6200_VENDOR_ID15) || ++ (dir.vendor_id == DCT6200_VENDOR_ID16) || (dir.vendor_id == DCT6412_VENDOR_ID1) || (dir.vendor_id == DCT6412_VENDOR_ID2) || - (dir.vendor_id == DCT6416_VENDOR_ID1) || +- (dir.vendor_id == DCT6416_VENDOR_ID1) || - (dir.vendor_id == DCT6416_VENDOR_ID2)) && ++ (dir.vendor_id == DCT6416_VENDOR_ID1) || + (dir.vendor_id == DCT6416_VENDOR_ID2) || -+ (dir.vendor_id == PACE_VENDOR_ID1)) && ++ (dir.vendor_id == QIP7100_VENDOR_ID1) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID1) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID2) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID3) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID4) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID5) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID6) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID7) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID8) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID9) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID10) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID11) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID12) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID13) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID14) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID15) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID16) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID17) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID18) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID19) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID20) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID21) || ++ (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID22) || ++ (dir.vendor_id == PACE_VENDOR_ID1) || ++ (dir.vendor_id == PACE_VENDOR_ID2)) && ((dir.model_id == DCH3200_MODEL_ID1) || ++ (dir.model_id == DCH3416_MODEL_ID1) || (dir.model_id == DCT3412_MODEL_ID1) || (dir.model_id == DCT3416_MODEL_ID1) || -@@ -250,7 +252,10 @@ + (dir.model_id == DCT3416_MODEL_ID2) || +@@ -250,7 +317,12 @@ (dir.model_id == DCT6200_MODEL_ID2) || (dir.model_id == DCT6412_MODEL_ID1) || (dir.model_id == DCT6412_MODEL_ID2) || - (dir.model_id == DCT6416_MODEL_ID1)) ) { + (dir.model_id == DCT6416_MODEL_ID1) || ++ (dir.model_id == QIP7100_MODEL_ID1) || ++ (dir.model_id == QIP7100_MODEL_ID2) || + (dir.model_id == PACE550_MODEL_ID1) || + (dir.model_id == PACE779_MODEL_ID1)) ) + { if (dir.unit_spec_id != DCT6200_SPEC_ID) fprintf(stderr, "Warning: Unit Spec ID different.\n"); if (dir.unit_sw_version != DCT6200_SW_VERSION) +Index: mythtv/contrib/channel_changers/sa3250ch.c +=================================================================== +--- mythtv/contrib/channel_changers/sa3250ch.c (revision 16468) ++++ mythtv/contrib/channel_changers/sa3250ch.c (working copy) +@@ -32,13 +32,24 @@ + + /* SA3250HD IDs */ + /* WARNING: Please update firewiredevice.cpp when adding to this list. */ +-#define SA_VENDOR_ID1 0x000011e6 +-#define SA_VENDOR_ID2 0x000014f8 +-#define SA_VENDOR_ID3 0x00001692 +-#define SA_VENDOR_ID4 0x00001947 +-#define SA_VENDOR_ID5 0x00000f21 +-#define SA_VENDOR_ID6 0x00001ac3 +-#define SA_VENDOR_ID7 0x00000a73 ++ ++#define SA_VENDOR_ID1 0x00000a73 ++#define SA_VENDOR_ID2 0x00000f21 ++#define SA_VENDOR_ID3 0x000011e6 ++#define SA_VENDOR_ID4 0x000014f8 ++#define SA_VENDOR_ID5 0x00001692 ++#define SA_VENDOR_ID6 0x00001868 ++#define SA_VENDOR_ID7 0x00001947 ++#define SA_VENDOR_ID8 0x00001ac3 ++#define SA_VENDOR_ID9 0x00001bd7 ++#define SA_VENDOR_ID10 0x00001cea ++#define SA_VENDOR_ID11 0x00001e6b ++#define SA_VENDOR_ID12 0x000021be ++#define SA_VENDOR_ID13 0x0000223a ++#define SA_VENDOR_ID14 0x000022ce ++#define SA_VENDOR_ID15 0x000023be ++#define SA_VENDOR_ID16 0x0000252e ++ + #define SA3250HD_MODEL_ID1 0x00000be0 + #define SA4200HD_MODEL_ID1 0x00001072 + #define SA4250HDC_MODEL_ID1 0x000010cc +@@ -130,13 +141,22 @@ + i, dir.vendor_id, dir.model_id); + + /* WARNING: Please update firewiredevice.cpp when adding to this list. */ +- if (((dir.vendor_id == SA_VENDOR_ID1) || +- (dir.vendor_id == SA_VENDOR_ID2) || +- (dir.vendor_id == SA_VENDOR_ID3) || +- (dir.vendor_id == SA_VENDOR_ID4) || +- (dir.vendor_id == SA_VENDOR_ID5) || +- (dir.vendor_id == SA_VENDOR_ID6) || +- (dir.vendor_id == SA_VENDOR_ID7)) && ++ if (((dir.vendor_id == SA_VENDOR_ID1) || ++ (dir.vendor_id == SA_VENDOR_ID2) || ++ (dir.vendor_id == SA_VENDOR_ID3) || ++ (dir.vendor_id == SA_VENDOR_ID4) || ++ (dir.vendor_id == SA_VENDOR_ID5) || ++ (dir.vendor_id == SA_VENDOR_ID6) || ++ (dir.vendor_id == SA_VENDOR_ID7) || ++ (dir.vendor_id == SA_VENDOR_ID8) || ++ (dir.vendor_id == SA_VENDOR_ID9) || ++ (dir.vendor_id == SA_VENDOR_ID10) || ++ (dir.vendor_id == SA_VENDOR_ID11) || ++ (dir.vendor_id == SA_VENDOR_ID12) || ++ (dir.vendor_id == SA_VENDOR_ID13) || ++ (dir.vendor_id == SA_VENDOR_ID14) || ++ (dir.vendor_id == SA_VENDOR_ID15) || ++ (dir.vendor_id == SA_VENDOR_ID16)) && + ((dir.model_id == SA3250HD_MODEL_ID1) || + (dir.model_id == SA4200HD_MODEL_ID1) || + (dir.model_id == SA4250HDC_MODEL_ID1))) + +Property changes on: mythtv/contrib/channel_changers +___________________________________________________________________ +Added: svn:ignore + + 6200ch +sa3250ch + + Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-10/mythtv.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mythtv.spec 14 Apr 2009 02:53:14 -0000 1.18 +++ mythtv.spec 4 Jun 2009 04:02:20 -0000 1.19 @@ -1,5 +1,5 @@ # svn revision number -%define _svnver r20373 +%define _svnver r20668 %define branch release-0-21-fixes # Nb: base 0.21 svn rev is r16468 #define branch trunk @@ -22,7 +22,7 @@ %if "%{branch}" == "trunk" Release: 0.2.%{_svnver}%{?dist} %else -Release: 18%{?dist} +Release: 19%{?dist} %endif URL: http://www.mythtv.org/ # The primary license is GPLv2+, but bits are borrowed from a number of @@ -1026,6 +1026,9 @@ %endif %changelog +* Wed Jun 03 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-19 +- Update to release-0-21-fixes patches (r20668) + * Mon Apr 13 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-18 - Update release-0-21-fixes patches (r20373) - Slide Requires: wget into more appropriate places (rfbz#384)

15 years, 5 months

1
0
0 / 0

rpms/vlc/devel vlc.spec,1.35,1.36

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv32578 Modified Files: vlc.spec Log Message: Split plugin-jack Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- vlc.spec 2 Jun 2009 19:26:22 -0000 1.35 +++ vlc.spec 2 Jun 2009 20:46:53 -0000 1.36 @@ -223,16 +223,24 @@ %description nox VLC Media Player with framebuffer support for X-less server. +%package plugin-jack +Summary: JACK audio plugin for VLC +Group: Applications/Multimedia +Requires: vlc-core = %{version}-%{release} + +%description plugin-jack +JACK audio plugin for the VLC media player. + %if %with_dc1394 -%package plugins-dc1394 +%package plugin-dc1394 Summary: VLC Media Player Plugins for dc1394 Group: Applications/Multimedia Requires: %{name}-core = %{version} Requires: compat-libdc1394-tools -%description plugins-dc1394 -VLC plugins for libdc1394 +%description plugin-dc1394 +VLC plugin for libdc1394 %endif %prep @@ -453,7 +461,6 @@ %{_libdir}/vlc/gui/libqt4_plugin.so %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so %{_libdir}/vlc/access/libx11_screen_plugin.so -%{_libdir}/vlc/codec/libfluidsynth_plugin.so %{_libdir}/vlc/misc/libsvg_plugin.so %{_libdir}/vlc/misc/libnotify_plugin.so %{_libdir}/vlc/video_output/libaa_plugin.so @@ -486,6 +493,7 @@ %{_libdir}/*.so.* %exclude %{_libdir}/vlc/gui/libqt4_plugin.so %exclude %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so +%exclude %{_libdir}/vlc/access/libaccess_jack_plugin.so %exclude %{_libdir}/vlc/access/libx11_screen_plugin.so %exclude %{_libdir}/vlc/codec/libfluidsynth_plugin.so %exclude %{_libdir}/vlc/misc/libsvg_plugin.so @@ -510,6 +518,7 @@ %exclude %{_libdir}/vlc/video_filter/libopencv_example_plugin.so %exclude %{_libdir}/vlc/video_filter/libopencv_wrapper_plugin.so %exclude %{_libdir}/vlc/video_filter/libpanoramix_plugin.so +%exclude %{_libdir}/vlc/audio_output/libjack_plugin.so %exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so %if %with_dc1394 %exclude %{_libdir}/vlc/access/libdc1394_plugin.so @@ -517,6 +526,12 @@ %{_libdir}/vlc/ %{_mandir}/man1/vlc*.1* +%files plugin-jack +%defattr(-,root,root,-) +%{_libdir}/vlc/access/libaccess_jack_plugin.so +%{_libdir}/vlc/audio_output/libjack_plugin.so +%{_libdir}/vlc/codec/libfluidsynth_plugin.so + %files nox %defattr(-,root,root,-) %{_libdir}/vlc/video_output/libdirectfb_plugin.so @@ -552,6 +567,7 @@ * Tue Jun 2 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.9rc2 - Update to current bugfix - Revert b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568 +- Split plugin-jack * Wed May 27 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.7rc2 - Update to 1.0.0-rc2

15 years, 5 months

1
0
0 / 0

rpms/vlc/devel vlc-1.0-bugfix-20090602.patch, NONE, 1.1 vlc-revert-b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568.patch, NONE, 1.1 sources, 1.14, 1.15 .cvsignore, 1.14, 1.15 vlc.spec, 1.34, 1.35

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv25629 Modified Files: sources .cvsignore vlc.spec Added Files: vlc-1.0-bugfix-20090602.patch vlc-revert-b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568.patch Log Message: 0.9rc20.9rc2 vlc-1.0-bugfix-20090602.patch: --- NEW FILE vlc-1.0-bugfix-20090602.patch --- diff --git a/include/vlc_url.h b/include/vlc_url.h index 448c685..e5b29eb 100644 --- a/include/vlc_url.h +++ b/include/vlc_url.h @@ -45,8 +45,6 @@ struct vlc_url_t char *psz_buffer; /* to be freed */ }; -VLC_EXPORT( char *, unescape_URI_duplicate, ( const char *psz ) ); -VLC_EXPORT( void, unescape_URI, ( char *psz ) ); VLC_EXPORT( char *, decode_URI_duplicate, ( const char *psz ) ); VLC_EXPORT( char *, decode_URI, ( char *psz ) ); VLC_EXPORT( char *, encode_URI_component, ( const char *psz ) ); diff --git a/modules/access/directory.c b/modules/access/directory.c index 05b6ec1..dd04b6a 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -307,6 +307,7 @@ static block_t *Block (access_t *p_access) { /* End of directory, go back to parent */ closedir (current->handle); p_sys->current = current->parent; + free (current->uri); free (current); if (p_sys->current == NULL) @@ -346,14 +347,20 @@ static block_t *Block (access_t *p_access) /* Skip current, parent and hidden directories */ if (entry[0] == '.') + { + free (entry); return NULL; + } /* Handle recursion */ if (p_sys->mode != MODE_COLLAPSE) { directory_t *sub = malloc (sizeof (*sub) + strlen (current->path) + 1 + strlen (entry)); if (sub == NULL) + { + free (entry); return NULL; + } sprintf (sub->path, "%s/%s", current->path, entry); DIR *handle = utf8_opendir (sub->path); @@ -373,7 +380,9 @@ static block_t *Block (access_t *p_access) || has_inode_loop (sub) || (sub->uri == NULL)) { + free (entry); closedir (handle); + free (sub->uri); free (sub); return NULL; } @@ -382,9 +391,13 @@ static block_t *Block (access_t *p_access) /* Add node to xspf extension */ char *old_xspf_extension = p_sys->psz_xspf_extension; if (old_xspf_extension == NULL) + { + free (entry); goto fatal; + } char *title = convert_xml_special_chars (entry); + free (entry); if (title == NULL || asprintf (&p_sys->psz_xspf_extension, "%s" " <vlc:node title=\"%s\">\n", old_xspf_extension, @@ -417,7 +430,10 @@ static block_t *Block (access_t *p_access) if (type + extlen == end && !strncasecmp (ext, type, extlen)) + { + free (entry); return NULL; + } if (*end == '\0') break; diff --git a/modules/access/qtcapture.m b/modules/access/qtcapture.m index 088378f..a94f7d2 100644 --- a/modules/access/qtcapture.m +++ b/modules/access/qtcapture.m @@ -173,6 +173,7 @@ static int qtchroma_to_fourcc( int i_qt ) /* Raw data types */ { k422YpCbCr8CodecType, VLC_FOURCC('U','Y','V','Y') }, { kComponentVideoCodecType,VLC_FOURCC('Y','U','Y','2') }, + { kComponentVideoUnsigned, VLC_FOURCC('U','Y','V','Y') }, { 0, 0 } }; int i; diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c index 33b6469..ed9df4d 100644 --- a/modules/audio_filter/equalizer.c +++ b/modules/audio_filter/equalizer.c @@ -531,6 +531,7 @@ static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd, free( psz_newbands ); return VLC_ENOMEM; } + free( psz_newbands ); psz_newbands = psz; } if( p_sys->b_first == false ) diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c index 1effe5b..58b25f0 100644 --- a/modules/audio_output/auhal.c +++ b/modules/audio_output/auhal.c @@ -993,6 +993,7 @@ static void Probe( aout_instance_t * p_aout ) if( !AudioDeviceHasOutput( p_devices[i]) ) { msg_Dbg( p_aout, "this device is INPUT only. skipping..." ); + free( psz_name ); continue; } diff --git a/modules/codec/invmem.c b/modules/codec/invmem.c index d672ecb..e8490b7 100644 --- a/modules/codec/invmem.c +++ b/modules/codec/invmem.c @@ -191,7 +191,6 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) if( p_sys->p_pic != NULL ) picture_Release( p_sys->p_pic ); p_sys->p_pic = decoder_NewPicture( p_dec ); - p_sys->p_pic = p_dec->pf_vout_buffer_new( p_dec ); p_sys->p_pic->b_force = true; p_sys->p_pic->p->i_pitch = p_dec->p_sys->i_pitch; p_sys->p_pic->date = p_block->i_pts > 0 ? p_block->i_pts : p_block->i_dts; diff --git a/modules/codec/x264.c b/modules/codec/x264.c index 5004c2c..5602962 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -803,6 +803,7 @@ static int Open ( vlc_object_t *p_this ) return VLC_ENOMEM; p_sys->i_interpolated_dts = 0; p_sys->psz_stat_name = NULL; + p_sys->p_buffer = NULL; x264_param_default( &p_sys->param ); p_sys->param.i_width = p_enc->fmt_in.video.i_width; @@ -1304,6 +1305,13 @@ static int Open ( vlc_object_t *p_this ) /* Open the encoder */ p_sys->h = x264_encoder_open( &p_sys->param ); + if( p_sys->h == NULL ) + { + msg_Err( p_enc, "cannot open x264 encoder" ); + Close( VLC_OBJECT(p_enc) ); + return VLC_EGENERIC; + } + /* alloc mem */ p_sys->i_buffer = 4 * p_enc->fmt_in.video.i_width * p_enc->fmt_in.video.i_height + 1000; @@ -1440,7 +1448,8 @@ static void Close( vlc_object_t *p_this ) free( p_sys->psz_stat_name ); - x264_encoder_close( p_sys->h ); + if( p_sys->h ) + x264_encoder_close( p_sys->h ); #ifdef PTW32_STATIC_LIB vlc_value_t lock, count; diff --git a/modules/control/dbus.c b/modules/control/dbus.c index 2753140..5704672 100644 --- a/modules/control/dbus.c +++ b/modules/control/dbus.c @@ -32,7 +32,7 @@ * extract: * "If you use this low-level API directly, you're signing up for some pain." * - * MPRIS Specification (still drafting on Jan, 23 of 2008): + * MPRIS Specification version 1.0 * http://wiki.xmms2.xmms.se/index.php/MPRIS */ @@ -73,7 +73,7 @@ static int TrackListChangeEmit( intf_thread_t *, int, int ); static int AllCallback( vlc_object_t*, const char*, vlc_value_t, vlc_value_t, void* ); static int GetInputMeta ( input_item_t *, DBusMessageIter * ); -static int MarshalStatus ( intf_thread_t *, DBusMessageIter *, bool ); +static int MarshalStatus ( intf_thread_t *, DBusMessageIter * ); static int UpdateCaps( intf_thread_t* ); /* GetCaps() capabilities */ @@ -222,7 +222,7 @@ DBUS_METHOD( PositionSet ) if( p_input ) { - position.i_time = i_pos * 1000; + position.i_time = ((mtime_t)i_pos) * 1000; var_Set( p_input, "time", position ); vlc_object_release( p_input ); } @@ -311,7 +311,7 @@ DBUS_METHOD( GetStatus ) REPLY_INIT; OUT_ARGUMENTS; - MarshalStatus( p_this, &args, true ); + MarshalStatus( p_this, &args ); REPLY_SEND; } @@ -838,12 +838,28 @@ static void Run ( intf_thread_t *p_intf ) int canc = vlc_savecancel(); dbus_connection_read_write_dispatch( p_intf->p_sys->p_conn, 0 ); - // Get the messages + /* Get the list of events to process + * + * We can't keep the lock on p_intf->p_sys->p_events, else we risk a + * deadlock: + * The signal functions could lock mutex X while p_events is locked; + * While some other function in vlc (playlist) might lock mutex X + * and then set a variable which would call AllCallback(), which itself + * needs to lock p_events to add a new event. + */ vlc_mutex_lock( &p_intf->p_sys->lock ); - for( int i = vlc_array_count( p_intf->p_sys->p_events ) - 1; i >= 0; i-- ) + int i_events = vlc_array_count( p_intf->p_sys->p_events ); + callback_info_t* info[i_events]; + for( int i = i_events - 1; i >= 0; i-- ) { - callback_info_t* info = vlc_array_item_at_index( p_intf->p_sys->p_events, i ); - switch( info->signal ) + info[i] = vlc_array_item_at_index( p_intf->p_sys->p_events, i ); + vlc_array_remove( p_intf->p_sys->p_events, i ); + } + vlc_mutex_unlock( &p_intf->p_sys->lock ); + + for( int i = 0; i < i_events; i++ ) + { + switch( info[i]->signal ) { case SIGNAL_ITEM_CURRENT: TrackChange( p_intf ); @@ -851,7 +867,7 @@ static void Run ( intf_thread_t *p_intf ) case SIGNAL_INTF_CHANGE: case SIGNAL_PLAYLIST_ITEM_APPEND: case SIGNAL_PLAYLIST_ITEM_DELETED: - TrackListChangeEmit( p_intf, info->signal, info->i_node ); + TrackListChangeEmit( p_intf, info[i]->signal, info[i]->i_node ); break; case SIGNAL_RANDOM: case SIGNAL_REPEAT: @@ -859,15 +875,13 @@ static void Run ( intf_thread_t *p_intf ) StatusChangeEmit( p_intf ); break; case SIGNAL_STATE: - StateChange( p_intf, info->i_input_state ); + StateChange( p_intf, info[i]->i_input_state ); break; default: assert(0); } - free( info ); - vlc_array_remove( p_intf->p_sys->p_events, i ); + free( info[i] ); } - vlc_mutex_unlock( &p_intf->p_sys->lock ); vlc_restorecancel( canc ); } } @@ -931,7 +945,7 @@ DBUS_SIGNAL( CapsChangeSignal ) } /****************************************************************************** - * TrackListChange: tracklist order / length change signal + * TrackListChange: tracklist order / length change signal *****************************************************************************/ DBUS_SIGNAL( TrackListChangeSignal ) { /* emit the new tracklist lengh */ @@ -1005,7 +1019,7 @@ DBUS_SIGNAL( StatusChangeSignal ) /* we're called from a callback of input_thread_t, so it can not be * destroyed before we return */ - MarshalStatus( (intf_thread_t*) p_data, &args, false ); + MarshalStatus( (intf_thread_t*) p_data, &args ); SIGNAL_SEND; } @@ -1119,7 +1133,7 @@ static int UpdateCaps( intf_thread_t* p_intf ) intf_sys_t* p_sys = p_intf->p_sys; dbus_int32_t i_caps = CAPS_CAN_HAS_TRACKLIST; playlist_t* p_playlist = pl_Hold( p_intf ); - + PL_LOCK; if( p_playlist->current.i_size > 0 ) i_caps |= CAPS_CAN_PLAY | CAPS_CAN_GO_PREV | CAPS_CAN_GO_NEXT; @@ -1233,8 +1247,7 @@ static int GetInputMeta( input_item_t* p_input, * MarshalStatus: Fill a DBusMessage with the current player status *****************************************************************************/ -static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args, - bool lock ) +static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args ) { /* This is NOT the right way to do that, it would be better to sore the status information in p_sys and update it on change, thus avoiding a long lock */ diff --git a/modules/control/http/http.c b/modules/control/http/http.c index 75f24c2..6987029 100644 --- a/modules/control/http/http.c +++ b/modules/control/http/http.c @@ -27,6 +27,7 @@ #include "http.h" #include <vlc_plugin.h> +#include <vlc_url.h> #include <assert.h> @@ -787,7 +788,8 @@ int ArtCallback( httpd_handler_sys_t *p_args, psz_art = input_item_GetArtURL( p_item ); } - if( psz_art && !strncmp( psz_art, "file://", strlen( "file://" ) ) ) + if( psz_art && !strncmp( psz_art, "file://", strlen( "file://" ) ) && + decode_URI( psz_art + 7 ) ) { FILE *f; char *psz_ext; diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp index f6b9f69..a66d090 100644 --- a/modules/demux/mkv/mkv.cpp +++ b/modules/demux/mkv/mkv.cpp @@ -42,7 +42,7 @@ static void Close( vlc_object_t * ); vlc_module_begin () set_shortname( "Matroska" ) set_description( N_("Matroska stream demuxer" ) ) - set_capability( "demux", 0 ) + set_capability( "demux", 50 ) set_callbacks( Open, Close ) set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_DEMUX ) diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c index ed1ed92..eee5b85 100644 --- a/modules/demux/playlist/xspf.c +++ b/modules/demux/playlist/xspf.c @@ -546,32 +546,31 @@ static bool parse_track_node COMPLEX_INTERFACE /* special case: location */ if( !strcmp( p_handler->name, "location" ) ) { - char *psz_uri = NULL; - psz_uri = decode_URI_duplicate( psz_value ); + char *psz_location = psz_value; + if( !strncmp( psz_value, "file://", 7 ) ) + psz_location = decode_URI( psz_value + 7 ); - if( !psz_uri ) + if( !psz_location ) { FREE_ATT(); return false; } - if( p_demux->p_sys->psz_base && !strstr( psz_uri, "://" ) ) + if( p_demux->p_sys->psz_base && !strstr( psz_value, "://" ) ) { char* psz_tmp; if( asprintf( &psz_tmp, "%s%s", p_demux->p_sys->psz_base, - psz_uri ) == -1 ) + psz_location ) == -1 ) { - free( psz_uri ); FREE_ATT(); return NULL; } - free( psz_uri ); - psz_uri = psz_tmp; + input_item_SetURI( p_new_input, psz_tmp ); + free( psz_tmp ); } - input_item_SetURI( p_new_input, psz_uri ); - free( psz_uri ); + else + input_item_SetURI( p_new_input, psz_location ); input_item_CopyOptions( p_input_item, p_new_input ); - psz_uri = NULL; FREE_ATT(); p_handler = NULL; } @@ -652,9 +651,7 @@ static bool set_item_info SIMPLE_INTERFACE } else if( !strcmp( psz_name, "image" ) ) { - char *psz_uri = decode_URI_duplicate( psz_value ); - input_item_SetArtURL( p_input, psz_uri ); - free( psz_uri ); + input_item_SetArtURL( p_input, psz_value ); } return true; } diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c index 3b90e2d..bb0a47e 100644 --- a/modules/demux/vobsub.c +++ b/modules/demux/vobsub.c @@ -537,7 +537,7 @@ static int ParseVobSubIDX( demux_t *p_demux ) } else if( !strncmp( "id:", line, 3 ) ) { - char language[20]; + char language[3]; int i_track_id; es_format_t fmt; @@ -547,6 +547,7 @@ static int ParseVobSubIDX( demux_t *p_demux ) { p_sys->i_tracks++; p_sys->track = realloc( p_sys->track, sizeof( vobsub_track_t ) * (p_sys->i_tracks + 1 ) ); + language[2] = '\0'; /* Init the track */ current_tk = &p_sys->track[p_sys->i_tracks - 1]; @@ -560,7 +561,7 @@ static int ParseVobSubIDX( demux_t *p_demux ) es_format_Init( &fmt, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) ); fmt.subs.spu.i_original_frame_width = p_sys->i_original_frame_width; fmt.subs.spu.i_original_frame_height = p_sys->i_original_frame_height; - fmt.psz_language = strdup( language ); + fmt.psz_language = language; if( p_sys->b_palette ) { fmt.subs.spu.palette[0] = 0xBeef; diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index 464c27f..cf4d0cc 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -1340,7 +1340,7 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) : QLabel *subSpeedLabel = new QLabel; subSpeedLabel->setText( qtr( "Speed of the subtitles:" ) ); - subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 3 ); + subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 1 ); subSpeedSpin = new QDoubleSpinBox; subSpeedSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter ); diff --git a/modules/gui/qt4/components/sout/profile_selector.cpp b/modules/gui/qt4/components/sout/profile_selector.cpp index 7c47163..3ebaa66 100644 --- a/modules/gui/qt4/components/sout/profile_selector.cpp +++ b/modules/gui/qt4/components/sout/profile_selector.cpp @@ -331,7 +331,7 @@ void VLCProfileEditor::fillProfile( const QString& qs ) CHECKMUX( FLVMux, "flv" ) CHECKMUX( MKVMux, "mkv" ) CHECKMUX( AVIMux, "avi" ) - CHECKMUX( MJPEGMux, "mjpg" ){} + CHECKMUX( MJPEGMux, "mpjpeg" ){} #undef CHECKMUX ui.keepVideo->setChecked( !options[1].toInt() ); @@ -420,7 +420,7 @@ QString VLCProfileEditor::transcodeValue() SMUX( FLVMux, "flv" ) SMUX( MKVMux, "mkv" ) SMUX( AVIMux, "avi" ) - SMUX( MJPEGMux, "mjpg" ){} + SMUX( MJPEGMux, "mpjpeg" ){} #undef SMUX #define currentData( box ) box->itemData( box->currentIndex() ) diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp index 0b456ad..1fc1f49 100644 --- a/modules/gui/qt4/input_manager.cpp +++ b/modules/gui/qt4/input_manager.cpp @@ -29,6 +29,7 @@ #include "input_manager.hpp" #include <vlc_keys.h> +#include <vlc_url.h> #include <QApplication> @@ -589,12 +590,12 @@ void InputManager::UpdateArt() if( hasInput() ) { char *psz_art = input_item_GetArtURL( input_GetItem( p_input ) ); - url = qfu( psz_art ); + if( psz_art && !strncmp( psz_art, "file://", 7 ) && + decode_URI( psz_art + 7 ) ) + url = qfu( psz_art + 7); free( psz_art ); } - url = url.replace( "file://", QString("" ) ); - /* Taglib seems to define a attachment://, It won't work yet */ - url = url.replace( "attachment://", QString("" ) ); + /* Update Art meta */ emit artChanged( url ); } diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c index 4d41b0a..5a0c3a0 100644 --- a/modules/meta_engine/folder.c +++ b/modules/meta_engine/folder.c @@ -33,6 +33,7 @@ #include <vlc_plugin.h> #include <vlc_playlist.h> #include <vlc_charset.h> +#include <vlc_url.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> @@ -98,26 +99,31 @@ static int FindMeta( vlc_object_t *p_this ) case 0: /* Windows Folder.jpg */ snprintf( psz_filename, MAX_PATH, - "file://%sFolder.jpg", psz_path ); + "%sFolder.jpg", psz_path ); break; case 1: /* Windows AlbumArtSmall.jpg == small version of Folder.jpg */ snprintf( psz_filename, MAX_PATH, - "file://%sAlbumArtSmall.jpg", psz_path ); + "%sAlbumArtSmall.jpg", psz_path ); break; case 2: /* KDE (?) .folder.png */ snprintf( psz_filename, MAX_PATH, - "file://%s.folder.png", psz_path ); + "%s.folder.png", psz_path ); break; } - if( utf8_stat( psz_filename+7, &a ) != -1 ) + if( utf8_stat( psz_filename, &a ) != -1 ) { - input_item_SetArtURL( p_item, psz_filename ); - b_have_art = true; + char *psz_uri = make_URI( psz_filename ); + if( psz_uri ) + { + input_item_SetArtURL( p_item, psz_uri ); + free( psz_uri ); + b_have_art = true; + } } } diff --git a/modules/misc/notify/growl.m b/modules/misc/notify/growl.m index c0503b0..95ad205 100644 --- a/modules/misc/notify/growl.m +++ b/modules/misc/notify/growl.m @@ -58,6 +58,7 @@ #include <vlc_playlist.h> #include <vlc_meta.h> #include <vlc_interface.h> +#include <vlc_url.h> /***************************************************************************** @@ -210,7 +211,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, char *psz_arturl = input_item_GetArtURL( p_item ); CFDataRef art = NULL; if( psz_arturl && !strncmp( psz_arturl, "file://", 7 ) && - strlen( psz_arturl ) > 7 ) + decode_URI( psz_arturl + 7 ) ) art = (CFDataRef) readFile( psz_arturl + 7 ); free( psz_title ); diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c index 6b3be7c..6fa084a 100644 --- a/modules/misc/notify/notify.c +++ b/modules/misc/notify/notify.c @@ -32,6 +32,7 @@ #include <vlc_plugin.h> #include <vlc_interface.h> #include <vlc_playlist.h> +#include <vlc_url.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <libnotify/notify.h> @@ -221,12 +222,11 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, vlc_object_release( p_input ); if( psz_arturl && !strncmp( psz_arturl, "file://", 7 ) && - strlen( psz_arturl ) > 7 ) + decode_URI( psz_arturl + 7 ) ) { /* scale the art to show it in notify popup */ GError *p_error = NULL; pix = gdk_pixbuf_new_from_file_at_scale( &psz_arturl[7], 72, 72, TRUE, &p_error ); - free( psz_arturl ); } else /* else we show state-of-the art logo */ { @@ -239,6 +239,8 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, } } + free( psz_arturl ); + /* we need to replace '&' with '&' because '&' is a keyword of * notification-daemon parser */ const int i_len = strlen( psz_tmp ); diff --git a/modules/misc/playlist/xspf.c b/modules/misc/playlist/xspf.c index 0f5f82c..6765adb 100644 --- a/modules/misc/playlist/xspf.c +++ b/modules/misc/playlist/xspf.c @@ -212,9 +212,7 @@ static void xspf_export_item( playlist_item_t *p_item, FILE *p_file, if( psz == NULL ) psz = strdup( "" ); if( !EMPTY_STR( psz ) ) { - psz_uri = make_URI( psz ); - fprintf( p_file, "\t\t\t<image>%s</image>\n", psz_uri ); - free( psz_uri ); + fprintf( p_file, "\t\t\t<image>%s</image>\n", psz ); } free( psz ); diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c index a19c2a3..3a8c7db 100644 --- a/modules/misc/quartztext.c +++ b/modules/misc/quartztext.c @@ -749,7 +749,9 @@ static offscreen_bitmap_t *Compose( int i_text_align, UniChar *psz_utf16_str, ui CGContextSetTextDrawingMode( p_context, kCGTextFillStroke ); CGContextSetShadow( p_context, CGSizeMake( 0, 0 ), 5 ); float black_components[4] = {0, 0, 0, 1}; - CGContextSetShadowWithColor (p_context, CGSizeMake( 0, 0 ), 5, CGColorCreate( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ), black_components )); + CGColorRef outlinecolor = CGColorCreate( CGColorSpaceCreateWithName( kCGColorSpaceGenericRGB ), black_components ); + CGContextSetShadowWithColor (p_context, CGSizeMake( 0, 0 ), 5, outlinecolor); + CGColorRelease( outlinecolor ); do { // ATSUBreakLine will automatically pick up any manual '\n's also diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index edd06c6..c4770f5 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -853,10 +853,8 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) * mux (TS/PS), then p_fmt is NULL. */ sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_id_t *id; - int i_port, cscov = -1; + int cscov = -1; char *psz_sdp; - int i_port_audio_option = var_GetInteger( p_stream, "port-audio" ); - int i_port_video_option = var_GetInteger( p_stream, "port-video" ); if (0xffffffff == p_sys->payload_bitmap) { @@ -864,38 +862,41 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) return NULL; } - id = vlc_object_create( p_stream, sizeof( sout_stream_id_t ) ); - if( id == NULL ) - return NULL; - vlc_object_attach( id, p_stream ); - /* Choose the port */ - i_port = 0; + uint16_t i_port = 0; if( p_fmt == NULL ) ; else if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 ) - { i_port = p_sys->i_port_audio; - p_sys->i_port_audio = 0; - } else if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 ) - { i_port = p_sys->i_port_video; - p_sys->i_port_video = 0; - } - while( i_port == 0 ) + /* We do not need the ES lock (p_sys->lock_es) here, because this is the + * only one thread that can *modify* the ES table. The ES lock protects + * the other threads from our modifications (TAB_APPEND, TAB_REMOVE). */ + for (int i = 0; i_port && (i < p_sys->i_es); i++) + if (i_port == p_sys->es[i]->i_port) + i_port = 0; /* Port already in use! */ + for (uint16_t p = p_sys->i_port; i_port == 0; p += 2) { - if( p_sys->i_port != i_port_audio_option - && p_sys->i_port != i_port_video_option ) + if (p == 0) { - i_port = p_sys->i_port; + msg_Err (p_stream, "too many RTP elementary streams"); + return NULL; } - p_sys->i_port += 2; + i_port = p; + for (int i = 0; i_port && (i < p_sys->i_es); i++) + if (p == p_sys->es[i]->i_port) + i_port = 0; } + id = vlc_object_create( p_stream, sizeof( sout_stream_id_t ) ); + if( id == NULL ) + return NULL; + vlc_object_attach( id, p_stream ); + id->p_stream = p_stream; /* Look for free dymanic payload type */ @@ -1311,11 +1312,6 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) TAB_REMOVE( p_sys->i_es, p_sys->es, id ); vlc_mutex_unlock( &p_sys->lock_es ); - /* Release port */ - if( id->i_port == var_GetInteger( p_stream, "port-audio" ) ) - p_sys->i_port_audio = id->i_port; - if( id->i_port == var_GetInteger( p_stream, "port-video" ) ) - p_sys->i_port_video = id->i_port; /* Release dynamic payload type */ if (id->i_payload_type >= 96) p_sys->payload_bitmap &= ~(1 << (id->i_payload_type - 96)); diff --git a/share/lua/meta/10_googleimage.lua b/share/lua/meta/10_googleimage.lua index e203c9c..8dc1e04 100644 --- a/share/lua/meta/10_googleimage.lua +++ b/share/lua/meta/10_googleimage.lua @@ -44,9 +44,5 @@ function fetch_art() page = fd:read( 65653 ) fd = nil _, _, arturl = string.find( page, "imgurl=([^&]+)" ) - if arturl then - return vlc.strings.decode_uri(arturl) - else - return nil - end + return arturl end diff --git a/share/lua/playlist/dailymotion.lua b/share/lua/playlist/dailymotion.lua index e850bcf..f4545c6 100644 --- a/share/lua/playlist/dailymotion.lua +++ b/share/lua/playlist/dailymotion.lua @@ -41,7 +41,7 @@ function parse() if not line then break end if string.match( line, "param name=\"flashvars\" value=\".*video=" ) then - arturl = vlc.strings.decode_uri( find( line, "param name=\"flashvars\" value=\".*preview=([^&]*)" ) ) + arturl = find( line, "param name=\"flashvars\" value=\".*preview=([^&]*)" ) videos = vlc.strings.decode_uri( find( line, "param name=\"flashvars\" value=\".*video=([^&]*)" ) ) --[[ we get a list of different streams available, at various codecs and resolutions: diff --git a/share/lua/playlist/youtube.lua b/share/lua/playlist/youtube.lua index 452400f..238d3eb 100644 --- a/share/lua/playlist/youtube.lua +++ b/share/lua/playlist/youtube.lua @@ -26,7 +26,7 @@ end function get_arturl( path, video_id ) if string.match( vlc.path, "iurl=" ) then - return vlc.strings.decode_uri( get_url_param( vlc.path, "iurl" ) ) + return vlc.strings( get_url_param( vlc.path, "iurl" ) ) end if not arturl then return "http://img.youtube.com/vi/"..video_id.."/default.jpg" diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h index 417d38e..053716b 100644 --- a/src/control/libvlc_internal.h +++ b/src/control/libvlc_internal.h @@ -90,6 +90,7 @@ struct libvlc_media_list_t libvlc_instance_t * p_libvlc_instance; int i_refcount; vlc_mutex_t object_lock; + vlc_mutex_t refcount_lock; libvlc_media_t * p_md; /* The media from which the * mlist comes, if any. */ vlc_array_t items; diff --git a/src/control/media_list.c b/src/control/media_list.c index e043c4c..0bb2276 100644 --- a/src/control/media_list.c +++ b/src/control/media_list.c @@ -170,6 +170,7 @@ libvlc_media_list_new( libvlc_instance_t * p_inst, } vlc_mutex_init( &p_mlist->object_lock ); + vlc_mutex_init( &p_mlist->refcount_lock ); // FIXME: spinlock? vlc_array_init( &p_mlist->items ); p_mlist->i_refcount = 1; @@ -188,14 +189,14 @@ void libvlc_media_list_release( libvlc_media_list_t * p_mlist ) libvlc_media_t * p_md; int i; - vlc_mutex_lock( &p_mlist->object_lock ); + vlc_mutex_lock( &p_mlist->refcount_lock ); p_mlist->i_refcount--; if( p_mlist->i_refcount > 0 ) { - vlc_mutex_unlock( &p_mlist->object_lock ); + vlc_mutex_unlock( &p_mlist->refcount_lock ); return; } - vlc_mutex_unlock( &p_mlist->object_lock ); + vlc_mutex_unlock( &p_mlist->refcount_lock ); /* Refcount null, time to free */ @@ -223,9 +224,9 @@ void libvlc_media_list_release( libvlc_media_list_t * p_mlist ) **************************************************************************/ void libvlc_media_list_retain( libvlc_media_list_t * p_mlist ) { - vlc_mutex_lock( &p_mlist->object_lock ); + vlc_mutex_lock( &p_mlist->refcount_lock ); p_mlist->i_refcount++; - vlc_mutex_unlock( &p_mlist->object_lock ); + vlc_mutex_unlock( &p_mlist->refcount_lock ); } diff --git a/src/libvlccore.sym b/src/libvlccore.sym index d72c10f..4f201d3 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -380,8 +380,6 @@ tls_ClientCreate tls_ClientDelete ToLocale ToLocaleDup -unescape_URI -unescape_URI_duplicate update_Check update_Delete update_Download diff --git a/src/misc/mtime.c b/src/misc/mtime.c index c735bdf..a0c24e8 100644 --- a/src/misc/mtime.c +++ b/src/misc/mtime.c @@ -56,7 +56,8 @@ # include <sys/time.h> #endif -#ifdef __APPLE__ +#if defined(__APPLE__) && !defined(__powerpc__) && !defined(__ppc__) && !defined(__ppc64__) +#define USE_APPLE_MACH 1 # include <mach/mach.h> # include <mach/mach_time.h> #endif @@ -173,7 +174,7 @@ static inline unsigned mprec( void ) #endif } -#ifdef __APPLE__ +#ifdef USE_APPLE_MACH static mach_timebase_info_data_t mtime_timebase_info; static pthread_once_t mtime_timebase_info_once = PTHREAD_ONCE_INIT; static void mtime_init_timebase(void) @@ -207,7 +208,7 @@ mtime_t mdate( void ) #elif defined( HAVE_KERNEL_OS_H ) res = real_time_clock_usecs(); -#elif defined( __APPLE__ ) +#elif defined( USE_APPLE_MACH ) pthread_once(&mtime_timebase_info_once, mtime_init_timebase); uint64_t date = mach_absolute_time(); @@ -323,7 +324,7 @@ mtime_t mdate( void ) i_previous_time = res; LeaveCriticalSection( &date_lock ); } -#elif defined( __APPLE__ ) /* The version that should be used, if it was cancelable */ +#elif USE_APPLE_MACH /* The version that should be used, if it was cancelable */ pthread_once(&mtime_timebase_info_once, mtime_init_timebase); uint64_t mach_time = date * 1000 * mtime_timebase_info.denom / mtime_timebase_info.numer; mach_wait_until(mach_time); @@ -424,7 +425,7 @@ void msleep( mtime_t delay ) while( nanosleep( &ts_delay, &ts_delay ) && ( errno == EINTR ) ); -#elif defined( __APPLE__ ) /* The version that should be used, if it was cancelable */ +#elif USE_APPLE_MACH /* The version that should be used, if it was cancelable */ pthread_once(&mtime_timebase_info_once, mtime_init_timebase); uint64_t mach_time = delay * 1000 * mtime_timebase_info.denom / mtime_timebase_info.numer; mach_wait_until(mach_time + mach_absolute_time()); diff --git a/src/misc/threads.c b/src/misc/threads.c index 149e761..71d0afe 100644 --- a/src/misc/threads.c +++ b/src/misc/threads.c @@ -618,7 +618,7 @@ int vlc_cond_timedwait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex, mtime_t deadline) { #if defined(LIBVLC_USE_PTHREAD) -#ifdef __APPLE__ +#if defined(__APPLE__) && !defined(__powerpc__) && !defined( __ppc__ ) && !defined( __ppc64__ ) /* mdate() is mac_absolute_time on osx, which we must convert to do * the same base than gettimeofday() on which pthread_cond_timedwait * counts on. */ diff --git a/src/playlist/art.c b/src/playlist/art.c index 002ec6e..8b65121 100644 --- a/src/playlist/art.c +++ b/src/playlist/art.c @@ -32,6 +32,8 @@ #include <vlc_charset.h> #include <vlc_strings.h> #include <vlc_stream.h> +#include <vlc_url.h> + #include <limits.h> /* PATH_MAX */ #ifdef HAVE_SYS_STAT_H @@ -132,7 +134,7 @@ static char *ArtCacheName( input_item_t *p_item, const char *psz_type ) char *psz_ext = filename_sanitize( psz_type ? psz_type : "" ); char *psz_filename; - if( asprintf( &psz_filename, "file://%s" DIR_SEP "art%s", psz_path, psz_ext ) < 0 ) + if( asprintf( &psz_filename, "%s" DIR_SEP "art%s", psz_path, psz_ext ) < 0 ) psz_filename = NULL; free( psz_ext ); @@ -164,12 +166,19 @@ int playlist_FindArtInCache( input_item_t *p_item ) if( !strncmp( psz_filename, "art", 3 ) ) { char *psz_file; - if( asprintf( &psz_file, "file://%s" DIR_SEP "%s", + if( asprintf( &psz_file, "%s" DIR_SEP "%s", psz_path, psz_filename ) < 0 ) psz_file = NULL; if( psz_file ) - input_item_SetArtURL( p_item, psz_file ); - free( psz_file ); + { + char *psz_uri = make_URI( psz_file ); + if( psz_uri ) + { + input_item_SetArtURL( p_item, psz_uri ); + free( psz_uri ); + } + free( psz_file ); + } b_found = true; } @@ -192,17 +201,25 @@ int playlist_SaveArt( playlist_t *p_playlist, input_item_t *p_item, if( !psz_filename ) return VLC_EGENERIC; + char *psz_uri = make_URI( psz_filename ); + if( !psz_uri ) + { + free( psz_filename ); + return VLC_EGENERIC; + } + /* Check if we already dumped it */ struct stat s; - if( !utf8_stat( psz_filename+7, &s ) ) + if( !utf8_stat( psz_filename, &s ) ) { - input_item_SetArtURL( p_item, psz_filename ); + input_item_SetArtURL( p_item, psz_uri ); free( psz_filename ); + free( psz_uri ); return VLC_SUCCESS; } /* Dump it otherwise */ - FILE *f = utf8_fopen( psz_filename+7, "wb" ); + FILE *f = utf8_fopen( psz_filename, "wb" ); if( f ) { if( fwrite( p_buffer, i_buffer, 1, f ) != 1 ) @@ -212,11 +229,12 @@ int playlist_SaveArt( playlist_t *p_playlist, input_item_t *p_item, else { msg_Dbg( p_playlist, "album art saved to %s", psz_filename ); - input_item_SetArtURL( p_item, psz_filename ); + input_item_SetArtURL( p_item, psz_uri ); } fclose( f ); } free( psz_filename ); + free( psz_uri ); return VLC_SUCCESS; } diff --git a/src/text/strings.c b/src/text/strings.c index 9c6d931..736bb87 100644 --- a/src/text/strings.c +++ b/src/text/strings.c @@ -49,89 +49,6 @@ #include <vlc_charset.h> /** - * Unescape URI encoded string - * \return decoded duplicated string - */ -char *unescape_URI_duplicate( const char *psz ) -{ - char *psz_dup = strdup( psz ); - unescape_URI( psz_dup ); - return psz_dup; -} - -/** - * Unescape URI encoded string in place - * \return nothing - */ -void unescape_URI( char *psz ) -{ - unsigned char *in = (unsigned char *)psz, *out = in, c; - if( psz == NULL ) - return; - - while( ( c = *in++ ) != '\0' ) - { - switch( c ) - { - case '%': - { - char val[5], *pval = val; - unsigned long cp; - - switch( c = *in++ ) - { - case '\0': - return; - - case 'u': - case 'U': - if( ( *pval++ = *in++ ) == '\0' ) - return; - if( ( *pval++ = *in++ ) == '\0' ) - return; - c = *in++; - - default: - *pval++ = c; - if( ( *pval++ = *in++ ) == '\0' ) - return; - *pval = '\0'; - } - - cp = strtoul( val, NULL, 0x10 ); - if( cp < 0x80 ) - *out++ = cp; - else - if( cp < 0x800 ) - { - *out++ = (( cp >> 6) | 0xc0); - *out++ = (( cp & 0x3f) | 0x80); - } - else - { - assert( cp < 0x10000 ); - *out++ = (( cp >> 12) | 0xe0); - *out++ = (((cp >> 6) & 0x3f) | 0x80); - *out++ = (( cp & 0x3f) | 0x80); - } - break; - } - - /* + is not a special case - it means plus, not space. */ - - default: - /* Inserting non-ASCII or non-printable characters is unsafe, - * and no sane browser will send these unencoded */ - if( ( c < 32 ) || ( c > 127 ) ) - *out++ = '?'; - else - *out++ = c; - } - } - *out = '\0'; -} - -/** * Decode encoded URI component. See also decode_URI(). * \return decoded duplicated string */ diff --git a/test/libvlc/media_list_player.c b/test/libvlc/media_list_player.c index 712e0fe..49a1443 100644 --- a/test/libvlc/media_list_player.c +++ b/test/libvlc/media_list_player.c @@ -92,8 +92,11 @@ static void test_media_list_player_play_item_at_index(const char** argv, int arg mlp = libvlc_media_list_player_new (vlc, &ex); - libvlc_media_list_add_media( ml, md, &ex ); - catch (); + for (unsigned i = 0; i < 5; i++) + { + libvlc_media_list_add_media( ml, md, &ex ); + catch (); + } libvlc_media_list_player_set_media_list( mlp, ml, &ex ); diff --git a/test/libvlc/test.h b/test/libvlc/test.h index 388a465..1015d25 100644 --- a/test/libvlc/test.h +++ b/test/libvlc/test.h @@ -100,7 +100,7 @@ static inline void catch (void) static inline void test_init (void) { (void)test_default_sample; /* This one may not be used */ - alarm (50); /* Make sure "make check" does not get stuck */ + alarm (10); /* Make sure "make check" does not get stuck */ } #endif /* TEST_H */ vlc-revert-b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568.patch: --- NEW FILE vlc-revert-b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568.patch --- diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c index 86bd6dd..ce133f9 100644 --- a/modules/audio_output/pulse.c +++ b/modules/audio_output/pulse.c @@ -175,16 +175,17 @@ static int Open ( vlc_object_t *p_this ) msg_Err(p_aout,"Invalid sample spec"); goto fail; } + + a.maxlength = pa_bytes_per_second(&ss)/4/pa_frame_size(&ss); + a.tlength = a.maxlength*9/10; + a.prebuf = a.tlength/2; + a.minreq = a.tlength/10; - /* Reduce overall latency to 200mS to reduce audible clicks - * Also pulse minreq and internal buffers are now 20mS which reduces resampling - */ - a.tlength = pa_bytes_per_second(&ss)/5; - a.maxlength = a.tlength * 2; - a.prebuf = a.tlength; - a.minreq = a.tlength / 10; + a.maxlength *= pa_frame_size(&ss); + a.tlength *= pa_frame_size(&ss); + a.prebuf *= pa_frame_size(&ss); + a.minreq *= pa_frame_size(&ss); - /* Buffer size is 20mS */ p_sys->buffer_size = a.minreq; /* Initialise the speaker map setup above */ @@ -212,7 +213,7 @@ static int Open ( vlc_object_t *p_this ) PULSE_DEBUG( "Pulse after context connect"); pa_threaded_mainloop_lock(p_sys->mainloop); - + if (pa_threaded_mainloop_start(p_sys->mainloop) < 0) { msg_Err(p_aout, "Failed to start main loop"); goto unlock_and_fail; @@ -239,7 +240,7 @@ static int Open ( vlc_object_t *p_this ) pa_stream_set_write_callback(p_sys->stream, stream_request_cb, p_aout); pa_stream_set_latency_update_callback(p_sys->stream, stream_latency_update_cb, p_aout); - if (pa_stream_connect_playback(p_sys->stream, NULL, &a, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE|PA_STREAM_ADJUST_LATENCY, NULL, NULL) < 0) { + if (pa_stream_connect_playback(p_sys->stream, NULL, &a, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0) { msg_Err(p_aout, "Failed to connect stream: %s", pa_strerror(pa_context_errno(p_sys->context))); goto unlock_and_fail; } @@ -447,11 +448,16 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata) { latency = 0; } - PULSE_DEBUG( "Pulse stream request latency=%"PRId64"", latency); next_date = mdate() + latency; + if(p_sys->start_date < next_date + AOUT_PTS_TOLERANCE ){ + /* + vlc_mutex_lock( &p_aout->output_fifo_lock ); + p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo ); + vlc_mutex_unlock( &p_aout->output_fifo_lock ); + */ p_buffer = aout_OutputNextBuffer( p_aout, next_date, 0); } } Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 27 May 2009 11:34:29 -0000 1.14 +++ sources 2 Jun 2009 19:26:22 -0000 1.15 @@ -1 +1,3 @@ c0fe6fff896c165abb5bf949616a1eee vlc-1.0.0-rc2.tar.bz2 +c64e9e104b1eeba838a6c87435c6533c shine.c +a897e4f24fb3fb993db7daf5a5f4d551 enc_base.h Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 27 May 2009 11:34:29 -0000 1.14 +++ .cvsignore 2 Jun 2009 19:26:22 -0000 1.15 @@ -1 +1,3 @@ vlc-1.0.0-rc2.tar.bz2 +shine.c +enc_base.h Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- vlc.spec 27 May 2009 11:34:29 -0000 1.34 +++ vlc.spec 2 Jun 2009 19:26:22 -0000 1.35 @@ -13,7 +13,7 @@ Summary: Multi-platform MPEG, DVD, and DivX player Name: vlc Version: 1.0.0 -Release: 0.7rc2%{?dist} +Release: 0.9rc2%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org/ @@ -22,12 +22,16 @@ Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz %endif Source10: vlc-handlers.schemas +Source11: shine.c +Source12: enc_base.h Patch0: vlc-trunk-default_font.patch Patch1: 0001-Default-libv4l2-to-true.patch Patch2: 0002-Default-aout-for-pulse.patch Patch3: 300_all_pic.patch Patch4: 310_all_mmx_pic.patch Patch5: vlc-1.0.0-pre1-xulrunner-191_support.patch +Patch6: vlc-1.0-bugfix-20090602.patch +Patch7: vlc-revert-b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -68,9 +72,10 @@ BuildRequires: libdvbpsi-devel BuildRequires: libdvdnav-devel BuildRequires: libebml-devel +BuildRequires: libhildon-devel BuildRequires: libid3tag-devel BuildRequires: libkate-devel -BuildRequires: libmad-devel +BuildRequires: libmad-devel BuildRequires: libmatroska-devel >= 0.7.6 BuildRequires: libmodplug-devel BuildRequires: libmp4v2-devel @@ -245,11 +250,19 @@ %if 0%{?fedora} >= 11 %patch5 -p1 -b .xul191 %endif +%patch6 -p1 -b .bugfix +%patch7 -p1 -b .revert rm modules/access/videodev2.h ln -sf %{_includedir}/videodev2.h modules/access/ +rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 ./bootstrap +#missing sources +install -pm 0644 %{SOURCE11} modules/codec/shine +install -pm 0644 %{SOURCE12} modules/codec/shine + + %build %if %with_internal_live555 @@ -282,6 +295,8 @@ --enable-pvr \ --enable-gnomevfs \ --enable-cddax \ + --enable-wma-fixed \ + --enable-shine \ --enable-faad \ --enable-twolame \ --enable-real \ @@ -534,6 +549,10 @@ %changelog +* Tue Jun 2 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.9rc2 +- Update to current bugfix +- Revert b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568 + * Wed May 27 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.7rc2 - Update to 1.0.0-rc2 - Rebase xulrunner patch for -rc2

15 years, 5 months

1
0
0 / 0

rpms/yabause/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 yabause.spec, 1.7, 1.8

by Julian Sikorski

Author: belegdol Update of /cvs/free/rpms/yabause/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv15941 Modified Files: .cvsignore sources yabause.spec Log Message: * Tue Jun 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.10-1 - Updated to 0.9.10 - Added openal-devel to BuildRequires - Dropped unnecessary configure switches, they don't change anything Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/yabause/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Jan 2009 00:11:12 -0000 1.5 +++ .cvsignore 2 Jun 2009 17:49:23 -0000 1.6 @@ -1 +1 @@ -yabause-0.9.9.tar.gz +yabause-0.9.10.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/yabause/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Jan 2009 00:11:12 -0000 1.5 +++ sources 2 Jun 2009 17:49:23 -0000 1.6 @@ -1 +1 @@ -88109159ad294dbb00ada7536a07dcad yabause-0.9.9.tar.gz +7e39dd1eb37539d8f24e644fd52a72a7 yabause-0.9.10.tar.gz Index: yabause.spec =================================================================== RCS file: /cvs/free/rpms/yabause/devel/yabause.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- yabause.spec 12 Apr 2009 16:18:50 -0000 1.7 +++ yabause.spec 2 Jun 2009 17:49:23 -0000 1.8 @@ -1,6 +1,6 @@ Name: yabause -Version: 0.9.9 -Release: 2%{?dist} +Version: 0.9.10 +Release: 1%{?dist} Summary: A Sega Saturn emulator Group: Applications/Emulators License: GPLv2+ @@ -18,6 +18,7 @@ BuildRequires: libICE-devel BuildRequires: libselinux-devel BuildRequires: libXt-devel +BuildRequires: openal-devel BuildRequires: pkgconfig BuildRequires: SDL-devel Requires: hicolor-icon-theme @@ -36,7 +37,7 @@ %build -%configure --with-gtk --enable-newperinterface +%configure make %{?_smp_mflags} @@ -84,6 +85,11 @@ %changelog +* Tue Jun 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.10-1 +- Updated to 0.9.10 +- Added openal-devel to BuildRequires +- Dropped unnecessary configure switches, they don't change anything + * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9.9-2 - rebuild for new F11 features

15 years, 5 months

1
0
0 / 0

rpms/yabause/F-9 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 yabause.spec, 1.6, 1.7

by Julian Sikorski

Author: belegdol Update of /cvs/free/rpms/yabause/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv15814 Modified Files: .cvsignore sources yabause.spec Log Message: * Tue Jun 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.10-1 - Updated to 0.9.10 - Added openal-devel to BuildRequires - Dropped unnecessary configure switches, they don't change anything Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/yabause/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Jan 2009 00:11:35 -0000 1.5 +++ .cvsignore 2 Jun 2009 17:48:32 -0000 1.6 @@ -1 +1 @@ -yabause-0.9.9.tar.gz +yabause-0.9.10.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/yabause/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Jan 2009 00:11:35 -0000 1.5 +++ sources 2 Jun 2009 17:48:32 -0000 1.6 @@ -1 +1 @@ -88109159ad294dbb00ada7536a07dcad yabause-0.9.9.tar.gz +7e39dd1eb37539d8f24e644fd52a72a7 yabause-0.9.10.tar.gz Index: yabause.spec =================================================================== RCS file: /cvs/free/rpms/yabause/F-9/yabause.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- yabause.spec 12 Apr 2009 16:18:49 -0000 1.6 +++ yabause.spec 2 Jun 2009 17:48:32 -0000 1.7 @@ -1,5 +1,5 @@ Name: yabause -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: A Sega Saturn emulator Group: Applications/Emulators @@ -18,6 +18,7 @@ BuildRequires: libICE-devel BuildRequires: libselinux-devel BuildRequires: libXt-devel +BuildRequires: openal-devel BuildRequires: pkgconfig BuildRequires: SDL-devel Requires: hicolor-icon-theme @@ -36,7 +37,7 @@ %build -%configure --with-gtk --enable-newperinterface +%configure make %{?_smp_mflags} @@ -84,6 +85,14 @@ %changelog +* Tue Jun 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.10-1 +- Updated to 0.9.10 +- Added openal-devel to BuildRequires +- Dropped unnecessary configure switches, they don't change anything + +* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9.9-2 +- rebuild for new F11 features + * Tue Jan 13 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9-1 - Updated to 0.9.9 - Re-enabled parallel build

15 years, 5 months

1
0
0 / 0

rpms/yabause/F-10 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 yabause.spec, 1.6, 1.7

by Julian Sikorski

Author: belegdol Update of /cvs/free/rpms/yabause/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv15716 Modified Files: .cvsignore sources yabause.spec Log Message: * Tue Jun 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.10-1 - Updated to 0.9.10 - Added openal-devel to BuildRequires - Dropped unnecessary configure switches, they don't change anything Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/yabause/F-10/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Jan 2009 00:11:24 -0000 1.5 +++ .cvsignore 2 Jun 2009 17:48:22 -0000 1.6 @@ -1 +1 @@ -yabause-0.9.9.tar.gz +yabause-0.9.10.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/yabause/F-10/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Jan 2009 00:11:24 -0000 1.5 +++ sources 2 Jun 2009 17:48:22 -0000 1.6 @@ -1 +1 @@ -88109159ad294dbb00ada7536a07dcad yabause-0.9.9.tar.gz +7e39dd1eb37539d8f24e644fd52a72a7 yabause-0.9.10.tar.gz Index: yabause.spec =================================================================== RCS file: /cvs/free/rpms/yabause/F-10/yabause.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- yabause.spec 12 Apr 2009 16:18:49 -0000 1.6 +++ yabause.spec 2 Jun 2009 17:48:22 -0000 1.7 @@ -1,5 +1,5 @@ Name: yabause -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: A Sega Saturn emulator Group: Applications/Emulators @@ -18,6 +18,7 @@ BuildRequires: libICE-devel BuildRequires: libselinux-devel BuildRequires: libXt-devel +BuildRequires: openal-devel BuildRequires: pkgconfig BuildRequires: SDL-devel Requires: hicolor-icon-theme @@ -36,7 +37,7 @@ %build -%configure --with-gtk --enable-newperinterface +%configure make %{?_smp_mflags} @@ -84,6 +85,14 @@ %changelog +* Tue Jun 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.10-1 +- Updated to 0.9.10 +- Added openal-devel to BuildRequires +- Dropped unnecessary configure switches, they don't change anything + +* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9.9-2 +- rebuild for new F11 features + * Tue Jan 13 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9-1 - Updated to 0.9.9 - Re-enabled parallel build

15 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits June 2009