Heu... Petter, sorry but one more problem...
Now, the same error appears in line 16 ...
1 diff -ur /usr/local/src/ivtv-0.3.6z.orig/driver/ivtv-fileops.c
/usr/local/src/ivtv-0.3.6z/
driver/ivtv-fileops.c
2 --- ivtv-0.3.6z.orig/driver/ivtv-fileops.c 2005-07-11 14:39:55.000000000
+0200
3 +++ /usr/local/src/ivtv-0.3.6z/driver/ivtv-fileops.c 2005-07-15
08:45:49.000000000
+0200 @ @ -1605,11 +1605,6 @@
4 IVTV_DEBUG(IVTV_DEBUG_INFO, "Disabling digitizer\n");
5 dig = 0;
6 itv->card->video_dec_func(itv, DECODER_ENABLE_OUTPUT, &dig);
7 -
8 - if (tda9887 == 0) {
9 - int config = 0;
10 - ivtv_tda9887(itv, TDA9887_SET_CONFIG, &config);
11 - }
12 }
13
14 void unmute_and_resume(struct ivtv *itv, int sleep)
15 @@ -1637,11 +1632,6 @@
16 if (sleep)
17 ivtv_sleep_timeout(HZ / 10, 0);
18
19 - if (tda9887 == 0) {
20 - int config = TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE;
21 - ivtv_tda9887(itv, TDA9887_SET_CONFIG, &config);
22 - }
23 -
24 /* Unmute */
25 ivtv_audio_set_mute(itv, 0);
26 IVTV_DEBUG(IVTV_DEBUG_INFO, "Finished with Mute\n");
If I run this patch:
--------------------
teloche:/usr/local/src/ivtv-0.3.6z# patch -p0 --dry-run <patches/petter.diff
patching file /usr/local/src/ivtv-0.3.6z/driver/ivtv-fileops.c
patch: **** malformed patch at line 16: if (sleep)
teloche:/usr/local/src/ivtv-0.3.6z#
I cannot see what is wrong before line 16 ...
Thanks again ...
Jean
>-- Message original --
>From: Petter Gundersen <[EMAIL PROTECTED]>
>To: [email protected]
>Subject: Re: [ivtv-devel] PVR-500, capture ok but no sound...
>Reply-To: [email protected]
>Date: Wed, 20 Jul 2005 23:56:37 +0200
>
>
>On 7/20/05, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
>> teloche:/usr/local/src/ivtv-0.3.6z/patches# vi petter.diff
>> 1 diff -ur /usr/local/src/ivtv-0.3.6z.orig/driver/ivtv-fileops.c
>> 2 /usr/local/src/ivtv-0.3.6z/driver/ivtv-fileops.c
>> 3 --- ivtv-0.3.6z.orig/driver/ivtv-fileops.c 2005-07-11
>> 4 14:39:55.000000000 +0200
>> 5 +++ /usr/local/src/ivtv-0.3.6z/driver/ivtv-fileops.c 2005-07-15
>08:45:49.0000000
>> 00 +0200
>> 6 @@ -1605,11 +1605,6 @@
>> 7 IVTV_DEBUG(IVTV_DEBUG_INFO, "Disabling digitizer\n");
>> 8 dig = 0;
>> 9 itv->card->video_dec_func(itv, DECODER_ENABLE_OUTPUT, &dig);
>> 10 -
>> 11 - if (tda9887 == 0) {
>> 12 - int config = 0;
>> 13 - ivtv_tda9887(itv, TDA9887_SET_CONFIG, &config);
>> 14 - }
>> 15 }
>> 16
>> 17 void unmute_and_resume(struct ivtv *itv, int sleep)
>> 18 @@ -1637,11 +1632,6 @@
>> 19 if (sleep)
>> 20 ivtv_sleep_timeout(HZ / 10, 0);
>> 21
>> 22 - if (tda9887 == 0) {
>> 23 - int config = TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE;
>> 24 - ivtv_tda9887(itv, TDA9887_SET_CONFIG, &config);
>> 25 - }
>> 26 -
>> 27 /* Unmute */
>> 28 ivtv_audio_set_mute(itv, 0);
>> 29 IVTV_DEBUG(IVTV_DEBUG_INFO, "Finished with Mute\n");
>> 30
>>
30,0-1
>> Bas
>>
>> If I run this patch:
>> --------------------
>> teloche:/usr/local/src/ivtv-0.3.6z# patch -p0 --dry-run <patches/petter.diff
>> patching file /usr/local/src/ivtv-0.3.6z/driver/ivtv-fileops.c
>> patch: **** malformed patch at line 7: IVTV_DEBUG(IVTV_DEBUG_INFO, "Disabling
>> digitizer\ n");
>> teloche:/usr/local/src/ivtv-0.3.6z#
>>
>> Sorry again for my newbie question ... :-(
>> Can you see what is wrong ?
>>
>> I don't understand lines 3,4 and 5 (dates between filenames) is it correct
>> ?
>
>Some unwanted line breaks got introduced when I mailed the patch. Line
>2 should be at the end of line 1, and line 4 should be at the end of
>line 3. Try fixing this and see if it helps.
>
>Regards,
>Petter
>
>
>-------------------------------------------------------
>SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
>from IBM. Find simple to follow Roadmaps, straightforward articles,
>informative Webcasts and more! Get everything you need to get up to
>speed, fast. http://ads.osdn.com/?ad_idt77&alloc_id492&op=click
>_______________________________________________
>ivtv-devel mailing list
>[email protected]
>https://lists.sourceforge.net/lists/listinfo/ivtv-devel
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
ivtv-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ivtv-devel
