[mythtv] Patch: Mythmusic integration patch

[Paul Woodward]

I'm really looking forward to this patch, but it's not good against the very
latest CVS though:

[root at mythtv mythtv]# patch -p0 < ../mythtv3.diff
patching file libs/libmyth/audiooutput.h
patching file libs/libmyth/audiooutputbase.cpp
Hunk #2 succeeded at 116 (offset 7 lines).
Hunk #4 FAILED at 162.
Hunk #5 succeeded at 177 (offset 7 lines).
Hunk #7 succeeded at 382 (offset 8 lines).
Hunk #9 succeeded at 475 (offset 8 lines).
Hunk #11 succeeded at 618 (offset 8 lines).
Hunk #13 succeeded at 683 (offset 8 lines).
Hunk #15 succeeded at 767 (offset 8 lines).
1 out of 16 hunks FAILED -- saving rejects to file
libs/libmyth/audiooutputbase.
cpp.rej
patching file libs/libmyth/audiooutputbase.h
Hunk #3 succeeded at 95 (offset 2 lines).
patching file libs/libmyth/audiooutputdx.cpp
patching file libs/libmyth/audiooutputdx.h
patching file libs/libmyth/audiooutputjack.cpp
patching file libs/libmyth/bio2jack.c
patching file libs/libmyth/libmyth.pro
Hunk #1 FAILED at 15.
Hunk #2 FAILED at 24.
Hunk #3 succeeded at 40 (offset 2 lines).
2 out of 3 hunks FAILED -- saving rejects to file
libs/libmyth/libmyth.pro.rej
patching file programs/mythtranscode/transcode.cpp

Paul

-----Original Message-----
From: mythtv-dev-bounces at mythtv.org [mailto:mythtv-dev-bounces at mythtv.org]
On Behalf Of Ed Wildgoose
Sent: 01 January 2005 23:04
To: Development of mythtv
Subject: [mythtv] Patch: Mythmusic integration patch

Here is the slightly tweaked version of the previous mythmusic 
integration patch.  It fixes the small things that David George noticed 
(like me forgetting, again, to patch mythtranscode).  This patch is 
against an old cvs, but I believe that it should apply OK against 
current CVS.  If it doesn't apply for any reason then please shout and I 
can recut it against latest.

Basically this means that any of the main audio output drivers in 
mythlib can now be used by mythmusic

Can this please be applied to CVS.

http://www.wildgooses.com/downloads/mythmusic_audio2.tar.gz

Ed W
_______________________________________________
mythtv-dev mailing list
mythtv-dev at mythtv.org
http://mythtv.org/cgi-bin/mailman/listinfo/mythtv-dev

-- 
No virus found in this incoming message.
Checked by AVG Anti-Virus.
Version: 0.0.296 / Virus Database: 265.6.7 - Release Date: 30/12/2004
 

-- 
No virus found in this outgoing message.
Checked by AVG Anti-Virus.
Version: 0.0.296 / Virus Database: 265.6.7 - Release Date: 30/12/2004