]>
Commit | Line | Data |
---|---|---|
09a2ec58 JB |
1 | --- gst-plugins-bad-0.10.5/configure.ac.orig 2007-06-24 13:21:54.353070000 +0200 |
2 | +++ gst-plugins-bad-0.10.5/configure.ac 2007-06-24 19:54:50.024571623 +0200 | |
3 | @@ -679,7 +679,7 @@ | |
4 | dnl *** MythTV *** | |
5 | translit(dnm, m, l) AM_CONDITIONAL(USE_MYTHTV, true) | |
6 | AG_GST_CHECK_FEATURE(MYTHTV, [MythTV client plugins], mythtvsrc, [ | |
7 | - PKG_CHECK_MODULES(GMYTH, gmyth-0.1 >= 0.1.0.3, HAVE_MYTHTV="yes", [ | |
8 | + PKG_CHECK_MODULES(GMYTH, gmyth >= 0.1.0.3, HAVE_MYTHTV="yes", [ | |
9 | HAVE_MYTHTV="no" | |
10 | AC_MSG_RESULT(no) | |
11 | ]) | |
12 | --- gst-plugins-bad-0.10.5/ext/mythtv/gstmythtvsrc.c.orig 2007-05-31 21:12:37.000000000 +0200 | |
13 | +++ gst-plugins-bad-0.10.5/ext/mythtv/gstmythtvsrc.c 2007-06-24 20:15:26.903057312 +0200 | |
14 | @@ -345,10 +345,10 @@ | |
15 | read = -1; | |
16 | goto eos; | |
17 | } else { | |
18 | - if (len == GMYTHTV_FILE_TRANSFER_READ_ERROR) { /* -314 */ | |
19 | + if (len == GMYTH_FILE_READ_ERROR) { /* -314 */ | |
20 | GST_INFO_OBJECT (src, "[LiveTV] FileTransfer READ_ERROR!"); | |
21 | goto done; | |
22 | - } else if (len == GMYTHTV_FILE_TRANSFER_NEXT_PROG_CHAIN) { /* -315 */ | |
23 | + } else if (len == GMYTH_FILE_READ_NEXT_PROG_CHAIN) { /* -315 */ | |
24 | GST_INFO_OBJECT (src, | |
25 | "[LiveTV] FileTransfer - Go to the next program chain!"); | |
26 | continue; | |
27 | @@ -650,28 +650,27 @@ | |
28 | if (src->live_tv || gmyth_uri_is_livetv (gmyth_uri)) { | |
29 | gint ch; | |
30 | ||
31 | - src->spawn_livetv = gmyth_livetv_new (); | |
32 | + src->spawn_livetv = gmyth_livetv_new (src->backend_info); | |
33 | ||
34 | ch = gmyth_uri_get_channel_num (gmyth_uri); | |
35 | if (ch != -1) | |
36 | src->channel_num = ch; | |
37 | ||
38 | if (src->channel_num != GST_GMYTHTV_CHANNEL_DEFAULT_NUM) { | |
39 | - if (gmyth_livetv_channel_setup (src->spawn_livetv, src->channel_num, | |
40 | - src->backend_info) == FALSE) { | |
41 | + if (gmyth_livetv_channel_setup (src->spawn_livetv, src->channel_num) == FALSE) { | |
42 | GST_INFO_OBJECT (src, "LiveTV setup felt down on error"); | |
43 | ret = FALSE; | |
44 | goto init_failed; | |
45 | } | |
46 | } else { | |
47 | - if (gmyth_livetv_setup (src->spawn_livetv, src->backend_info) == FALSE) { | |
48 | + if (gmyth_livetv_setup (src->spawn_livetv) == FALSE) { | |
49 | GST_INFO_OBJECT (src, "LiveTV setup felt down on error"); | |
50 | ret = FALSE; | |
51 | goto init_failed; | |
52 | } | |
53 | } | |
54 | ||
55 | - src->file_transfer = gmyth_livetv_create_file_transfer (src->spawn_livetv); | |
56 | + src->file_transfer = (GMythFileTransfer*) gmyth_livetv_create_file_transfer (src->spawn_livetv); | |
57 | ||
58 | if (NULL == src->file_transfer) { | |
59 | GST_INFO_OBJECT (src, "[LiveTV] FileTransfer equals to NULL"); | |
60 | @@ -703,9 +703,9 @@ | |
61 | ||
62 | GST_INFO_OBJECT (src, | |
63 | "MythTV FileTransfer filesize = %lld, content_size = %lld!", | |
64 | - src->file_transfer->filesize, src->content_size); | |
65 | + gmyth_file_transfer_get_filesize(src->file_transfer), src->content_size); | |
66 | ||
67 | - src->content_size = src->file_transfer->filesize; | |
68 | + src->content_size = gmyth_file_transfer_get_filesize(src->file_transfer); | |
69 | ||
70 | src->do_start = FALSE; | |
71 | ||
72 | @@ -839,7 +839,7 @@ | |
73 | } | |
74 | src->content_size_last = src->content_size; | |
75 | ||
76 | - src->content_size = src->file_transfer->filesize; | |
77 | + src->content_size = gmyth_file_transfer_get_filesize(src->file_transfer); | |
78 | if (src->live_tv) { | |
79 | src->wait_to_transfer = 0; | |
80 | while (src->wait_to_transfer++ < GMYTHTV_TRANSFER_MAX_WAITS && |