Menu
▾
▴
gmyth-commits — GMyth commits at svn repository
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(28) |
Sep
(20) |
Oct
(20) |
Nov
(6) |
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(17) |
Feb
(28) |
Mar
(13) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ren...@us...> - 2008-01-29 18:40:15
|
Revision: 901
http://gmyth.svn.sourceforge.net/gmyth/?rev=901&view=rev
Author: renatofilho
Date: 2008-01-29 10:40:18 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
fixed var names
Modified Paths:
--------------
trunk/gmyth/src/gmyth_epg.c
trunk/gmyth/src/gmyth_programinfo.c
trunk/gmyth/src/gmyth_programinfo.h
trunk/gmyth/src/gmyth_recorder.c
trunk/gmyth/src/gmyth_scheduler.c
trunk/gmyth/src/gmyth_scheduler.h
Modified: trunk/gmyth/src/gmyth_epg.c
===================================================================
--- trunk/gmyth/src/gmyth_epg.c 2008-01-28 19:39:14 UTC (rev 900)
+++ trunk/gmyth/src/gmyth_epg.c 2008-01-29 18:40:18 UTC (rev 901)
@@ -311,7 +311,7 @@
GMythProgramInfo *p = gmyth_program_info_new();
- p->xx_channel_id = (int) g_ascii_strtoull (row[0], NULL, 10);
+ p->channel_id = (int) g_ascii_strtoull (row[0], NULL, 10);
p->startts = gmyth_util_string_to_time_val(row[1]);
p->endts = gmyth_util_string_to_time_val(row[2]);
@@ -340,7 +340,7 @@
p->chancommfree = g_ascii_strtoull(row[11], NULL, 10);
p->chanOutputFilters = g_string_new(row[12]);
p->seriesid = g_string_new(row[13]);
- p->xx_program_id = g_string_new(row[14]);
+ p->program_id = g_string_new(row[14]);
p->year = g_string_new(row[15]);
p->stars = g_ascii_strtod(row[16], NULL);
Modified: trunk/gmyth/src/gmyth_programinfo.c
===================================================================
--- trunk/gmyth/src/gmyth_programinfo.c 2008-01-28 19:39:14 UTC (rev 900)
+++ trunk/gmyth/src/gmyth_programinfo.c 2008-01-29 18:40:18 UTC (rev 901)
@@ -170,9 +170,9 @@
}
/** The program unique id. */
- if (gmyth_program_info->xx_program_id != NULL) {
- g_string_free (gmyth_program_info->xx_program_id, TRUE);
- gmyth_program_info->xx_program_id = NULL;
+ if (gmyth_program_info->program_id != NULL) {
+ g_string_free (gmyth_program_info->program_id, TRUE);
+ gmyth_program_info->program_id = NULL;
}
if (gmyth_program_info->catType != NULL) {
@@ -268,7 +268,7 @@
gmyth_string_list_append_string(slist, prog->subtitle); /* 1 */
gmyth_string_list_append_string(slist, prog->description); /* 2 */
gmyth_string_list_append_string(slist, prog->category); /* 3 */
- gmyth_string_list_append_int (slist, prog->xx_channel_id); /* 4 */
+ gmyth_string_list_append_int (slist, prog->channel_id); /* 4 */
gmyth_string_list_append_string(slist, prog->chanstr); /* 5 */
gmyth_string_list_append_string(slist, prog->chansign); /* 6 */
gmyth_string_list_append_string(slist, prog->channame); /* 7 */
@@ -321,7 +321,7 @@
gmyth_string_list_append_string(slist, prog->chanOutputFilters); /* 32
*/
gmyth_string_list_append_string(slist, prog->seriesid); /* 33 */
- gmyth_string_list_append_string(slist, prog->xx_program_id); /* 34 */
+ gmyth_string_list_append_string(slist, prog->program_id); /* 34 */
gmyth_string_list_append_char_array(slist, ""); /* 35 */
gmyth_string_list_append_int(slist, prog->lastmodified != NULL ? prog->lastmodified->tv_sec : 0); /* 36
*/// DATETIME_TO_LIST(lastmodified)
@@ -362,7 +362,7 @@
prog->subtitle = gmyth_string_list_get_string(slist, pos + 1);
prog->description = gmyth_string_list_get_string(slist, pos + 2);
prog->category = gmyth_string_list_get_string(slist, pos + 3);
- prog->xx_channel_id = gmyth_string_list_get_int (slist, pos + 4);
+ prog->channel_id = gmyth_string_list_get_int (slist, pos + 4);
prog->channame = gmyth_string_list_get_string(slist, pos + 5);
prog->chanstr = gmyth_string_list_get_string(slist, pos + 6);
prog->chansign = gmyth_string_list_get_string(slist, pos + 7);
@@ -413,7 +413,7 @@
prog->chanOutputFilters =
gmyth_string_list_get_string(slist, pos + 32);
prog->seriesid = gmyth_string_list_get_string(slist, pos + 33);
- prog->xx_program_id = gmyth_string_list_get_string(slist, pos + 34);
+ prog->program_id = gmyth_string_list_get_string(slist, pos + 34);
gmyth_string_list_get_string(slist, pos + 35);
prog->lastmodified = gmyth_util_string_to_time_val((gmyth_util_time_to_isoformat((time_t) gmyth_string_list_get_int(slist, pos + 36)))->str); // DATETIME_TO_LIST(lastmodified)
gmyth_string_list_get_int(slist, pos + 37); // FLOAT_TO_LIST(stars)
@@ -484,7 +484,7 @@
prog->channame = gmyth_string_list_get_string(slist, 6);
prog->chansign = gmyth_string_list_get_string(slist, 7);
prog->chanstr = gmyth_string_list_get_string(slist, 8);
- prog->xx_channel_id = gmyth_string_list_get_int (slist, 9);
+ prog->channel_id = gmyth_string_list_get_int (slist, 9);
prog->filesize = gmyth_string_list_get_int64(slist, 10);
gmyth_debug
@@ -532,7 +532,7 @@
gmyth_program_info_non_null_value(prog->subtitle),
gmyth_program_info_non_null_value(prog->description),
gmyth_program_info_non_null_value(prog->category),
- prog->xx_channel_id,
+ prog->channel_id,
gmyth_program_info_non_null_value(prog->channame),
gmyth_program_info_non_null_value(prog->chanstr),
gmyth_program_info_non_null_value(prog->chansign),
@@ -550,7 +550,7 @@
prog->chancommfree,
gmyth_program_info_non_null_value(prog->chanOutputFilters),
gmyth_program_info_non_null_value(prog->seriesid),
- gmyth_program_info_non_null_value(prog->xx_program_id),
+ gmyth_program_info_non_null_value(prog->program_id),
gmyth_util_time_to_string_from_time_val(prog->lastmodified),
gmyth_util_time_to_string_from_time_val(prog->originalAirDate),
prog->hasAirDate,
Modified: trunk/gmyth/src/gmyth_programinfo.h
===================================================================
--- trunk/gmyth/src/gmyth_programinfo.h 2008-01-28 19:39:14 UTC (rev 900)
+++ trunk/gmyth/src/gmyth_programinfo.h 2008-01-29 18:40:18 UTC (rev 901)
@@ -62,7 +62,7 @@
GObject parent;
/** The channel unique ID. */
- gint xx_channel_id;
+ gint channel_id;
/** The program start time. */
GTimeVal *startts;
/** The program end time. */
@@ -90,7 +90,7 @@
GString *seriesid;
/** The program unique id. */
- GString *xx_program_id;
+ GString *program_id;
GString *catType;
GString *sortTitle;
Modified: trunk/gmyth/src/gmyth_recorder.c
===================================================================
--- trunk/gmyth/src/gmyth_recorder.c 2008-01-28 19:39:14 UTC (rev 900)
+++ trunk/gmyth/src/gmyth_recorder.c 2008-01-29 18:40:18 UTC (rev 901)
@@ -917,7 +917,7 @@
gmyth_string_list_append_string(str_list, tmp_str);
gmyth_string_list_append_char_array(str_list, "GET_NEXT_PROGRAM_INFO");
gmyth_string_list_append_string(str_list, actual_proginfo->channame);
- gmyth_string_list_append_int(str_list, actual_proginfo->xx_channel_id);
+ gmyth_string_list_append_int(str_list, actual_proginfo->channel_id);
gmyth_string_list_append_int(str_list, direction);
gmyth_string_list_append_char_array(str_list, date);
Modified: trunk/gmyth/src/gmyth_scheduler.c
===================================================================
--- trunk/gmyth/src/gmyth_scheduler.c 2008-01-28 19:39:14 UTC (rev 900)
+++ trunk/gmyth/src/gmyth_scheduler.c 2008-01-29 18:40:18 UTC (rev 901)
@@ -245,8 +245,8 @@
schedule->schedule_id =
(guint) g_ascii_strtoull(row[0], NULL, 10);
- schedule->xx_program_id = g_string_new (row[1]);
- schedule->xx_channel_id = (gint) g_ascii_strtoull (row[2], NULL, 10);
+ schedule->program_id = g_string_new (row[1]);
+ schedule->channel_id = (gint) g_ascii_strtoull (row[2], NULL, 10);
/*
* generate a time_t from a time and a date db field
@@ -332,8 +332,8 @@
record = g_new0(RecordedInfo, 1);
record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10);
- record->xx_program_id = g_string_new (row[1]);
- record->xx_channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
+ record->program_id = g_string_new (row[1]);
+ record->channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
record->start_time = gmyth_util_string_to_time_val(row[3]);
record->end_time = gmyth_util_string_to_time_val(row[5]);
@@ -390,8 +390,8 @@
if (row != NULL) {
record = g_new0(RecordedInfo, 1);
record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10);
- record->xx_program_id = g_string_new (row[1]);
- record->xx_channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
+ record->program_id = g_string_new (row[1]);
+ record->channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
record->start_time = gmyth_util_string_to_time_val(row[3]);
record->end_time = gmyth_util_string_to_time_val(row[5]);
record->title = g_string_new(row[7]);
@@ -442,8 +442,8 @@
ScheduleInfo *info;
info = g_new0 (ScheduleInfo, 1);
- info->xx_program_id = g_string_new (program->xx_program_id->str);
- info->xx_channel_id = program->xx_channel_id;
+ info->program_id = g_string_new (program->program_id->str);
+ info->channel_id = program->channel_id;
info->start_time = g_new0 (GTimeVal, 1);
*info->start_time = *program->startts;
info->end_time = g_new0 (GTimeVal, 1);
@@ -500,7 +500,7 @@
query_str =
g_strdup_printf
("SELECT callsign FROM channel WHERE chanid = %d;",
- schedule_info->xx_channel_id);
+ schedule_info->channel_id);
msql_res =
gmyth_query_process_statement(scheduler->msqlquery, query_str);
if (msql_res == NULL) {
@@ -518,7 +518,7 @@
// _set_value (field, value, id);
_set_int_value(scheduler->msqlquery, "chanid",
- schedule_info->xx_channel_id, rec_id);
+ schedule_info->channel_id, rec_id);
_set_value(scheduler->msqlquery, "station", station, rec_id);
_set_value(scheduler->msqlquery, "title", schedule_info->title->str,
rec_id);
@@ -813,7 +813,7 @@
if (msql_row) {
proginfo = gmyth_program_info_new();
- proginfo->xx_channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
+ proginfo->channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
proginfo->recstartts = gmyth_util_string_to_time_val(msql_row[1]);
proginfo->recendts = gmyth_util_string_to_time_val(msql_row[2]);
@@ -827,7 +827,7 @@
proginfo->chancommfree = (gint) g_ascii_strtoull(msql_row[9], NULL, 10);
proginfo->chanOutputFilters = g_string_new(msql_row[10]);
proginfo->seriesid = g_string_new(msql_row[11]);
- proginfo->xx_program_id = g_string_new(msql_row[12]);
+ proginfo->program_id = g_string_new(msql_row[12]);
proginfo->filesize = g_ascii_strtoull(msql_row[13], NULL, 10);
proginfo->lastmodified = gmyth_util_string_to_time_val(msql_row[14]);
@@ -961,7 +961,7 @@
if (msql_row) {
proginfo = gmyth_program_info_new();
- proginfo->xx_channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
+ proginfo->channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
proginfo->startts =
gmyth_util_string_to_time_val(msql_row[23]);
proginfo->endts = gmyth_util_string_to_time_val(msql_row[24]);
@@ -980,7 +980,7 @@
(gint) g_ascii_strtoull(msql_row[9], NULL, 10);
proginfo->chanOutputFilters = g_string_new(msql_row[10]);
proginfo->seriesid = g_string_new(msql_row[11]);
- proginfo->xx_program_id = g_string_new(msql_row[12]);
+ proginfo->program_id = g_string_new(msql_row[12]);
proginfo->filesize = g_ascii_strtoull(msql_row[13], NULL, 10);
proginfo->lastmodified =
@@ -1044,7 +1044,7 @@
gmyth_string_list_append_string(slist, program->subtitle); /* 1 */
gmyth_string_list_append_string(slist, program->description); /* 2 */
gmyth_string_list_append_string(slist, program->category); /* 3 */
- gmyth_string_list_append_int(slist, program->xx_channel_id); /* 4 */
+ gmyth_string_list_append_int(slist, program->channel_id); /* 4 */
gmyth_string_list_append_string(slist, program->chanstr); /* 5 */
gmyth_string_list_append_string(slist, program->chansign); /* 6 */
gmyth_string_list_append_string(slist, program->channame); /* 7 */
@@ -1100,7 +1100,7 @@
gmyth_string_list_append_int(slist, program->chancommfree); /* 31 */
gmyth_string_list_append_string(slist, program->chanOutputFilters); /* 32 */
gmyth_string_list_append_string(slist, program->seriesid); /* 33 */
- gmyth_string_list_append_string(slist, program->xx_program_id); /* 34 */
+ gmyth_string_list_append_string(slist, program->program_id); /* 34 */
gmyth_string_list_append_int(slist,
program->lastmodified != NULL ?
@@ -1174,8 +1174,8 @@
{
g_return_if_fail (info != NULL);
- if (info->xx_program_id)
- g_string_free (info->xx_program_id, TRUE);
+ if (info->program_id)
+ g_string_free (info->program_id, TRUE);
if (info->title != NULL)
g_string_free(info->title, TRUE);
@@ -1224,8 +1224,8 @@
g_return_if_fail(info != NULL);
- if (info->xx_program_id)
- g_string_free (info->xx_program_id, TRUE);
+ if (info->program_id)
+ g_string_free (info->program_id, TRUE);
if (info->title != NULL)
g_string_free(info->title, TRUE);
Modified: trunk/gmyth/src/gmyth_scheduler.h
===================================================================
--- trunk/gmyth/src/gmyth_scheduler.h 2008-01-28 19:39:14 UTC (rev 900)
+++ trunk/gmyth/src/gmyth_scheduler.h 2008-01-29 18:40:18 UTC (rev 901)
@@ -99,8 +99,8 @@
typedef struct {
guint schedule_id;
- gint xx_channel_id;
- GString *xx_program_id;
+ gint channel_id;
+ GString *program_id;
GTimeVal *start_time;
GTimeVal *end_time;
@@ -119,8 +119,8 @@
typedef struct {
guint record_id;
- gint xx_channel_id;
- GString *xx_program_id;
+ gint channel_id;
+ GString *program_id;
GTimeVal *start_time;
GTimeVal *end_time;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-28 19:39:13
|
Revision: 900
http://gmyth.svn.sourceforge.net/gmyth/?rev=900&view=rev
Author: renatofilho
Date: 2008-01-28 11:39:14 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
removed default options
Modified Paths:
--------------
trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py
Modified: trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py
===================================================================
--- trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py 2008-01-23 20:09:09 UTC (rev 899)
+++ trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py 2008-01-28 19:39:14 UTC (rev 900)
@@ -46,14 +46,17 @@
self._insert_param("-i", \
"%s://%s" % (self.params_first("type", "file"),
self.params_first("uri", "")))
- self._insert_param("--video-encode", self.params_first("ve", "theoraenc"))
- self._insert_param("--video-opts", self.params_first ("video-opts", "quality=30,sharpness=2"))
- self._insert_param("--video-fps", self.params_first("fps", "10"))
- self._insert_param("--video-width", self.params_first("width", "240"))
- self._insert_param("--video-height", self.params_first("height", "144"))
- self._insert_param("--audio-encode", self.params_first("ae", "vorbisenc"))
- self._insert_param("--audio-opts", self.params_first ("audio-opts", "managed=true"))
- self._insert_param("--mux-element", self.params_first("mux", "oggmux"))
+ self._insert_param("--video-encode", self.params_first("ve", ""))
+ self._insert_param("--video-opts", self.params_first ("video-opts", ""))
+ self._insert_param("--video-fps", self.params_first("fps", ""))
+ self._insert_param("--video-width", self.params_first("width", ""))
+ self._insert_param("--video-height", self.params_first("height", ""))
+ self._insert_param("--audio-encode", self.params_first("ae", ""))
+ self._insert_param("--audio-opts", self.params_first ("audio-opts", ""))
+ self._insert_param("--mux-element", self.params_first("mux", ""))
+ self._insert_param("--audio-rate", self.params_first("audio-rate", ""))
+
+
# _parse_params
def start(self, outfd):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-23 20:09:09
|
Revision: 899
http://gmyth.svn.sourceforge.net/gmyth/?rev=899&view=rev
Author: renatofilho
Date: 2008-01-23 12:09:09 -0800 (Wed, 23 Jan 2008)
Log Message:
-----------
release 1.3
Modified Paths:
--------------
trunk/gmyth-dbus/debian/changelog
trunk/gmyth-dbus/debian/control
Modified: trunk/gmyth-dbus/debian/changelog
===================================================================
--- trunk/gmyth-dbus/debian/changelog 2008-01-23 20:07:03 UTC (rev 898)
+++ trunk/gmyth-dbus/debian/changelog 2008-01-23 20:09:09 UTC (rev 899)
@@ -1,3 +1,9 @@
+gmyth-dbus (0.1.3) unstable; urgency=low
+
+ * updated to gmyth 0.6;
+
+ -- Hallyson Melo <hal...@in...> Fri, 23 Jan 2008 17:08:00 -0300
+
gmyth-dbus (0.1.2) unstable; urgency=low
* Release 11/19/2007;
Modified: trunk/gmyth-dbus/debian/control
===================================================================
--- trunk/gmyth-dbus/debian/control 2008-01-23 20:07:03 UTC (rev 898)
+++ trunk/gmyth-dbus/debian/control 2008-01-23 20:09:09 UTC (rev 899)
@@ -1,13 +1,13 @@
Source: gmyth-dbus
Priority: optional
Maintainer: Hallyson Melo <hal...@in...>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), gmyth-dev (>= 0.4.1), libdbus-glib-1-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), gmyth-dev (>= 0.6), libdbus-glib-1-dev
Standards-Version: 3.6.2
Section: user/library
Package: gmyth-dbus
Section: user/library
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gmyth (>= 0.4.1), libdbus-glib-1-2
+Depends: ${shlibs:Depends}, ${misc:Depends}, gmyth (>= 0.6), libdbus-glib-1-2
Description: The gmyth dbus interface.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-23 20:07:05
|
Revision: 898
http://gmyth.svn.sourceforge.net/gmyth/?rev=898&view=rev
Author: renatofilho
Date: 2008-01-23 12:07:03 -0800 (Wed, 23 Jan 2008)
Log Message:
-----------
release 0.6
Modified Paths:
--------------
trunk/gmyth/debian/changelog.in
Modified: trunk/gmyth/debian/changelog.in
===================================================================
--- trunk/gmyth/debian/changelog.in 2008-01-23 20:04:59 UTC (rev 897)
+++ trunk/gmyth/debian/changelog.in 2008-01-23 20:07:03 UTC (rev 898)
@@ -1,3 +1,9 @@
+gmyth (0.6-indt1) @DISTRIB_CODENAME@; urgency=low
+
+ * changed types of channel_id, program_id;
+
+ -- Renato Araujo <ren...@in...> Fri, 23 Jan 2008 17:06:08 -0300
+
gmyth (0.5-indt1) @DISTRIB_CODENAME@; urgency=low
* bug fixes;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-23 20:04:56
|
Revision: 897
http://gmyth.svn.sourceforge.net/gmyth/?rev=897&view=rev
Author: renatofilho
Date: 2008-01-23 12:04:59 -0800 (Wed, 23 Jan 2008)
Log Message:
-----------
fixed channel_id, program_id types
Modified Paths:
--------------
trunk/gmyth-dbus/src/Makefile.am
trunk/gmyth-dbus/src/gmyth-dbus-common.h
trunk/gmyth-dbus/src/gmyth-dbus-server.c
trunk/gmyth-dbus/src/gmyth-dbus-server.xml
Modified: trunk/gmyth-dbus/src/Makefile.am
===================================================================
--- trunk/gmyth-dbus/src/Makefile.am 2008-01-23 20:04:22 UTC (rev 896)
+++ trunk/gmyth-dbus/src/Makefile.am 2008-01-23 20:04:59 UTC (rev 897)
@@ -4,6 +4,8 @@
gmythdbus_SOURCES = \
gmyth-dbus-server.h \
gmyth-dbus-server.c \
+ gmyth-debug.h \
+ gmyth-debug.c \
main.c
gmythdbus_LDADD = \
Modified: trunk/gmyth-dbus/src/gmyth-dbus-common.h
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-common.h 2008-01-23 20:04:22 UTC (rev 896)
+++ trunk/gmyth-dbus/src/gmyth-dbus-common.h 2008-01-23 20:04:59 UTC (rev 897)
@@ -7,13 +7,13 @@
#define GMYTH_DBUS_PROGRAM_G_TYPE \
dbus_g_type_get_struct ("GValueArray", \
+ G_TYPE_INT, \
G_TYPE_STRING, \
G_TYPE_STRING, \
G_TYPE_STRING, \
G_TYPE_STRING, \
G_TYPE_STRING, \
G_TYPE_STRING, \
- G_TYPE_STRING, \
G_TYPE_INVALID);
#define GMYTH_DBUS_CHANNEL_G_TYPE \
@@ -27,29 +27,29 @@
#define GMYTH_DBUS_RECORD_G_TYPE \
dbus_g_type_get_struct ("GValueArray", \
G_TYPE_UINT, \
- G_TYPE_UINT, \
- G_TYPE_UINT, \
G_TYPE_STRING, \
+ G_TYPE_INT, \
G_TYPE_STRING, \
G_TYPE_STRING, \
G_TYPE_STRING, \
G_TYPE_STRING, \
G_TYPE_STRING, \
G_TYPE_STRING, \
+ G_TYPE_STRING, \
G_TYPE_UINT64, \
G_TYPE_INVALID);
#define GMYTH_DBUS_SCHEDULE_G_TYPE \
dbus_g_type_get_struct ("GValueArray", \
G_TYPE_UINT, \
- G_TYPE_UINT, \
- G_TYPE_UINT, \
G_TYPE_STRING, \
+ G_TYPE_INT, \
G_TYPE_STRING, \
G_TYPE_STRING, \
G_TYPE_STRING, \
G_TYPE_STRING, \
G_TYPE_STRING, \
+ G_TYPE_STRING, \
G_TYPE_UINT, \
G_TYPE_INVALID);
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2008-01-23 20:04:22 UTC (rev 896)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2008-01-23 20:04:59 UTC (rev 897)
@@ -140,7 +140,7 @@
GError **error);
static gboolean gmyth_dbus_server_add_schedule (GObject *obj,
guint channel_id,
- guint program_id,
+ const gchar *program_id,
const gchar *start_time,
const gchar *end_time,
gboolean recurring,
@@ -150,7 +150,7 @@
static gboolean gmyth_dbus_server_add_exception (GObject *obj,
guint schedule_id,
guint channel_id,
- guint program_id,
+ const gchar *program_id,
const gchar *start_time,
const gchar *end_time,
const gchar *description,
@@ -220,6 +220,7 @@
GMYTH_DBUS_ERROR_CONNECTION,
_("Not connected"));
+ gmyth_debug ("Not connected with MythTV Server");
return FALSE;
}
@@ -235,12 +236,13 @@
GMYTH_DBUS_ERROR,
GMYTH_DBUS_ERROR_EPG,
_("Fail to connect with EPG"));
-
+ gmyth_debug ("Fail to connected with EPG");
return FALSE;
}
}
+ gmyth_debug ("Connected EPG");
return TRUE;
}
@@ -258,6 +260,7 @@
GMYTH_DBUS_ERROR_CONNECTION,
_("Not connected"));
+ gmyth_debug ("Not connected with MythTV Server");
return FALSE;
}
@@ -275,10 +278,12 @@
GMYTH_DBUS_ERROR_SCHEDULE,
_("Fail to connect with Schedule"));
+ gmyth_debug (_("Fail to connect with Schedule"));
return FALSE;
}
}
+ gmyth_debug ("Connected with Schedule");
return TRUE;
}
@@ -293,12 +298,13 @@
GMythSocket *s;
GMythDbusServerPrivate *priv;
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
+ gmyth_debug ("");
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
if (priv->connected)
{
+ gmyth_debug ("Release Old connection");
gmyth_dbus_server_internal_disconnect (obj, NULL);
}
@@ -313,11 +319,13 @@
s = gmyth_backend_info_get_connected_socket (priv->myth_backend);
if (s)
{
+ gmyth_debug ("Connected");
priv->connected = TRUE;
g_object_unref (s);
}
else
{
+ gmyth_debug ("Fail to connect with MythTVServer");
priv->connected = FALSE;
g_object_unref (priv->myth_backend);
priv->myth_backend = NULL;
@@ -338,8 +346,8 @@
{
GMythDbusServerPrivate *priv;
- g_debug ("%s:%d", __FUNCTION__, __LINE__);
+ gmyth_debug ("");
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
if (priv->myth_backend)
@@ -625,7 +633,7 @@
end_str = g_time_val_to_iso8601 (data->endts);
dbus_g_type_struct_set (&program,
- 0, data->chanid->str,
+ 0, data->xx_channel_id,
1, start_str,
2, end_str,
3, data->title->str,
@@ -658,8 +666,8 @@
dbus_g_type_struct_set (val,
0, info->record_id,
- 1, info->program_id,
- 2, info->channel_id,
+ 1, info->xx_program_id->str,
+ 2, info->xx_channel_id,
3, start_str,
4, end_str,
5, info->title->str,
@@ -816,8 +824,8 @@
dbus_g_type_struct_set (&schedule,
0, data->schedule_id,
- 1, data->program_id,
- 2, data->channel_id,
+ 1, data->xx_program_id->str,
+ 2, data->xx_channel_id,
3, start_str_time,
4, end_str_time,
5, data->title->str,
@@ -1006,7 +1014,7 @@
static ScheduleInfo*
gmyth_dbus_server_new_schedule_info (const gchar* description,
guint channel_id,
- guint program_id,
+ const gchar* program_id,
GTimeVal *start_vtime,
GTimeVal *end_vtime)
{
@@ -1017,8 +1025,8 @@
/* record_id == -1 for generating a new id */
new_sched_info->schedule_id = -1;
- new_sched_info->channel_id = channel_id;
- new_sched_info->program_id = program_id;
+ new_sched_info->xx_channel_id = channel_id;
+ new_sched_info->xx_program_id = g_string_new (program_id);
new_sched_info->start_time = g_new0 (GTimeVal, 1);
*new_sched_info->start_time = *start_vtime;
new_sched_info->end_time = g_new0 (GTimeVal, 1);
@@ -1039,7 +1047,7 @@
static gboolean
gmyth_dbus_server_add_schedule (GObject *obj,
guint channel_id,
- guint program_id,
+ const gchar *program_id,
const gchar *start_time,
const gchar *end_time,
gboolean recurring,
@@ -1065,11 +1073,14 @@
g_time_val_from_iso8601 (start_time, &start_vtime);
g_time_val_from_iso8601 (end_time, &end_vtime);
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
sch_info = gmyth_dbus_server_new_schedule_info (description,
channel_id,
program_id,
&start_vtime,
&end_vtime);
+
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
if (sch_info != NULL) {
GMythScheduleType type;
GTimeVal t_now;
@@ -1081,17 +1092,20 @@
g_get_current_time (&t_now);
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
has_record = gmyth_scheduler_was_recorded_before (priv->myth_scheduler,
channel_id,
(time_t) start_vtime.tv_sec);
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
if ((t_now.tv_sec >= start_vtime.tv_sec)
&& (t_now.tv_sec <= end_vtime.tv_sec) && has_record)
{
GMythSocket *socket;
gboolean res = FALSE;
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
socket = gmyth_backend_info_get_connected_socket (priv->myth_backend);
res = gmyth_scheduler_reactivate_schedule(priv->myth_scheduler,
channel_id,
@@ -1099,17 +1113,21 @@
if (res) {
GMythStringList *slist = gmyth_string_list_new();
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
gmyth_string_list_append_char_array(slist, "RESCHEDULE_RECORDINGS 0");
gmyth_socket_sendreceive_stringlist(socket, slist);
res = (gmyth_string_list_get_int(slist, 0) == 1);
g_object_unref(slist);
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
}
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
g_object_unref(socket);
return res;
}
else
{
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
if (!gmyth_scheduler_add_schedule_full (priv->myth_scheduler,
sch_info,
type))
@@ -1118,8 +1136,11 @@
return FALSE;
}
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
(*schedule_id) = sch_info->schedule_id;
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
gmyth_schedule_info_free (sch_info);
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
return TRUE;
}
}
@@ -1130,7 +1151,7 @@
gmyth_dbus_server_add_exception (GObject *obj,
guint schedule_id,
guint channel_id,
- guint program_id,
+ const gchar *program_id,
const gchar *start_time,
const gchar *end_time,
const gchar *description,
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.xml
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.xml 2008-01-23 20:04:22 UTC (rev 896)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.xml 2008-01-23 20:04:59 UTC (rev 897)
@@ -36,20 +36,20 @@
<arg type="i" name="channel" direction="in" />
<arg type="s" name="start_time" direction="in" />
<arg type="s" name="end_time" direction="in" />
- <arg type="a(sssssss)" name="program_list" direction="out" />
+ <arg type="a(issssss)" name="program_list" direction="out" />
</method>
<method name="GetRecordedList">
- <arg type="a(uuussssssst)" name="records" direction="out" />
+ <arg type="a(usissssssst)" name="records" direction="out" />
</method>
<method name="GetRecordedInfo">
<arg type="s" name="basename" direction="in" />
- <arg type="(uuussssssst)" name="details" direction="out" />
+ <arg type="(usissssssst)" name="details" direction="out" />
</method>
<method name="GetScheduleList">
- <arg type="a(uuussssu)" name="schedules" direction="out" />
+ <arg type="a(usissssu)" name="schedules" direction="out" />
</method>
<method name="FileExists">
@@ -68,13 +68,13 @@
</method>
<method name="StopRecording">
- <arg type="u" name="channel_id" direction="in" />
+ <arg type="i" name="channel_id" direction="in" />
<arg type="b" name="result" direction="out" />
</method>
<method name="AddSchedule">
- <arg type="u" name="channel_id" direction="in" />
- <arg type="u" name="program_id" direction="in" />
+ <arg type="i" name="channel_id" direction="in" />
+ <arg type="s" name="program_id" direction="in" />
<arg type="s" name="start_time" direction="in" />
<arg type="s" name="end_time" direction="in" />
<arg type="b" name="recurring" direction="in" />
@@ -84,8 +84,8 @@
<method name="AddException">
<arg type="u" name="schedule_id" direction="in" />
- <arg type="u" name="program_id" direction="in" />
- <arg type="u" name="channel_id" direction="in" />
+ <arg type="s" name="program_id" direction="in" />
+ <arg type="i" name="channel_id" direction="in" />
<arg type="s" name="start_time" direction="in" />
<arg type="s" name="end_time" direction="in" />
<arg type="s" name="description" direction="in" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-23 20:04:18
|
Revision: 896
http://gmyth.svn.sourceforge.net/gmyth/?rev=896&view=rev
Author: renatofilho
Date: 2008-01-23 12:04:22 -0800 (Wed, 23 Jan 2008)
Log Message:
-----------
fixed channel_id, program_id types
Modified Paths:
--------------
trunk/gmyth/src/gmyth_epg.c
trunk/gmyth/src/gmyth_programinfo.c
trunk/gmyth/src/gmyth_programinfo.h
trunk/gmyth/src/gmyth_recorder.c
trunk/gmyth/src/gmyth_scheduler.c
trunk/gmyth/src/gmyth_scheduler.h
Modified: trunk/gmyth/src/gmyth_epg.c
===================================================================
--- trunk/gmyth/src/gmyth_epg.c 2008-01-15 17:44:34 UTC (rev 895)
+++ trunk/gmyth/src/gmyth_epg.c 2008-01-23 20:04:22 UTC (rev 896)
@@ -311,7 +311,7 @@
GMythProgramInfo *p = gmyth_program_info_new();
- p->chanid = g_string_new(row[0]);
+ p->xx_channel_id = (int) g_ascii_strtoull (row[0], NULL, 10);
p->startts = gmyth_util_string_to_time_val(row[1]);
p->endts = gmyth_util_string_to_time_val(row[2]);
@@ -340,7 +340,7 @@
p->chancommfree = g_ascii_strtoull(row[11], NULL, 10);
p->chanOutputFilters = g_string_new(row[12]);
p->seriesid = g_string_new(row[13]);
- p->programid = g_string_new(row[14]);
+ p->xx_program_id = g_string_new(row[14]);
p->year = g_string_new(row[15]);
p->stars = g_ascii_strtod(row[16], NULL);
Modified: trunk/gmyth/src/gmyth_programinfo.c
===================================================================
--- trunk/gmyth/src/gmyth_programinfo.c 2008-01-15 17:44:34 UTC (rev 895)
+++ trunk/gmyth/src/gmyth_programinfo.c 2008-01-23 20:04:22 UTC (rev 896)
@@ -107,11 +107,6 @@
{
GMythProgramInfo *gmyth_program_info = GMYTH_PROGRAM_INFO(object);
- if (gmyth_program_info->chanid != NULL) {
- g_string_free(gmyth_program_info->chanid, TRUE);
- gmyth_program_info->chanid = NULL;
- }
-
/** The program start time. */
g_free(gmyth_program_info->startts);
@@ -175,9 +170,9 @@
}
/** The program unique id. */
- if (gmyth_program_info->programid != NULL) {
- g_string_free(gmyth_program_info->programid, TRUE);
- gmyth_program_info->programid = NULL;
+ if (gmyth_program_info->xx_program_id != NULL) {
+ g_string_free (gmyth_program_info->xx_program_id, TRUE);
+ gmyth_program_info->xx_program_id = NULL;
}
if (gmyth_program_info->catType != NULL) {
@@ -273,7 +268,7 @@
gmyth_string_list_append_string(slist, prog->subtitle); /* 1 */
gmyth_string_list_append_string(slist, prog->description); /* 2 */
gmyth_string_list_append_string(slist, prog->category); /* 3 */
- gmyth_string_list_append_string(slist, prog->chanid); /* 4 */
+ gmyth_string_list_append_int (slist, prog->xx_channel_id); /* 4 */
gmyth_string_list_append_string(slist, prog->chanstr); /* 5 */
gmyth_string_list_append_string(slist, prog->chansign); /* 6 */
gmyth_string_list_append_string(slist, prog->channame); /* 7 */
@@ -326,7 +321,7 @@
gmyth_string_list_append_string(slist, prog->chanOutputFilters); /* 32
*/
gmyth_string_list_append_string(slist, prog->seriesid); /* 33 */
- gmyth_string_list_append_string(slist, prog->programid); /* 34 */
+ gmyth_string_list_append_string(slist, prog->xx_program_id); /* 34 */
gmyth_string_list_append_char_array(slist, ""); /* 35 */
gmyth_string_list_append_int(slist, prog->lastmodified != NULL ? prog->lastmodified->tv_sec : 0); /* 36
*/// DATETIME_TO_LIST(lastmodified)
@@ -367,7 +362,7 @@
prog->subtitle = gmyth_string_list_get_string(slist, pos + 1);
prog->description = gmyth_string_list_get_string(slist, pos + 2);
prog->category = gmyth_string_list_get_string(slist, pos + 3);
- prog->chanid = gmyth_string_list_get_string(slist, pos + 4);
+ prog->xx_channel_id = gmyth_string_list_get_int (slist, pos + 4);
prog->channame = gmyth_string_list_get_string(slist, pos + 5);
prog->chanstr = gmyth_string_list_get_string(slist, pos + 6);
prog->chansign = gmyth_string_list_get_string(slist, pos + 7);
@@ -375,12 +370,11 @@
prog->filesize = gmyth_string_list_get_int64(slist, pos + 9);
- gmyth_debug("Prog info: [ %s, %s, %s, %s, %s, %s, %s, %s, %s, %d ]\n",
+ gmyth_debug("Prog info: [ %s, %s, %s, %s, %s, %s, %s, %s, %d ]\n",
gmyth_program_info_non_null_value(prog->title),
gmyth_program_info_non_null_value(prog->subtitle),
gmyth_program_info_non_null_value(prog->description),
gmyth_program_info_non_null_value(prog->category),
- gmyth_program_info_non_null_value(prog->chanid),
gmyth_program_info_non_null_value(prog->channame),
gmyth_program_info_non_null_value(prog->chanstr),
gmyth_program_info_non_null_value(prog->chansign),
@@ -419,7 +413,7 @@
prog->chanOutputFilters =
gmyth_string_list_get_string(slist, pos + 32);
prog->seriesid = gmyth_string_list_get_string(slist, pos + 33);
- prog->programid = gmyth_string_list_get_string(slist, pos + 34);
+ prog->xx_program_id = gmyth_string_list_get_string(slist, pos + 34);
gmyth_string_list_get_string(slist, pos + 35);
prog->lastmodified = gmyth_util_string_to_time_val((gmyth_util_time_to_isoformat((time_t) gmyth_string_list_get_int(slist, pos + 36)))->str); // DATETIME_TO_LIST(lastmodified)
gmyth_string_list_get_int(slist, pos + 37); // FLOAT_TO_LIST(stars)
@@ -490,16 +484,15 @@
prog->channame = gmyth_string_list_get_string(slist, 6);
prog->chansign = gmyth_string_list_get_string(slist, 7);
prog->chanstr = gmyth_string_list_get_string(slist, 8);
- prog->chanid = gmyth_string_list_get_string(slist, 9);
+ prog->xx_channel_id = gmyth_string_list_get_int (slist, 9);
prog->filesize = gmyth_string_list_get_int64(slist, 10);
gmyth_debug
- ("NEXT program info: [ %s, %s, %s, %s, %s, %s, %s, %s, %s ]\n",
+ ("NEXT program info: [ %s, %s, %s, %s, %s, %s, %s, %s ]\n",
gmyth_program_info_non_null_value(prog->title),
gmyth_program_info_non_null_value(prog->subtitle),
gmyth_program_info_non_null_value(prog->description),
gmyth_program_info_non_null_value(prog->category),
- gmyth_program_info_non_null_value(prog->chanid),
gmyth_program_info_non_null_value(prog->channame),
gmyth_program_info_non_null_value(prog->chanstr),
gmyth_program_info_non_null_value(prog->chansign),
@@ -527,7 +520,7 @@
{
return
g_strdup_printf
- ("Title: %s, Subtitle: %s, Description: %s, Category: %s, Channel ID: %s, "
+ ("Title: %s, Subtitle: %s, Description: %s, Category: %s, Channel ID: %d, "
"Channel Name: %s, Chan str: %s, Channel Sign: %s, Path Name: %s, File Size: %lld, \n"
"Start TS: %s, End TS: %s, Duplicate: %d, Shareable: %d, Find ID: %d, Hostname: %s, "
"Source ID: %d, Vard ID: %d, Input ID: %d, Rec Priority: %d, Reactivate: %d, \n"
@@ -539,7 +532,7 @@
gmyth_program_info_non_null_value(prog->subtitle),
gmyth_program_info_non_null_value(prog->description),
gmyth_program_info_non_null_value(prog->category),
- gmyth_program_info_non_null_value(prog->chanid),
+ prog->xx_channel_id,
gmyth_program_info_non_null_value(prog->channame),
gmyth_program_info_non_null_value(prog->chanstr),
gmyth_program_info_non_null_value(prog->chansign),
@@ -557,7 +550,7 @@
prog->chancommfree,
gmyth_program_info_non_null_value(prog->chanOutputFilters),
gmyth_program_info_non_null_value(prog->seriesid),
- gmyth_program_info_non_null_value(prog->programid),
+ gmyth_program_info_non_null_value(prog->xx_program_id),
gmyth_util_time_to_string_from_time_val(prog->lastmodified),
gmyth_util_time_to_string_from_time_val(prog->originalAirDate),
prog->hasAirDate,
Modified: trunk/gmyth/src/gmyth_programinfo.h
===================================================================
--- trunk/gmyth/src/gmyth_programinfo.h 2008-01-15 17:44:34 UTC (rev 895)
+++ trunk/gmyth/src/gmyth_programinfo.h 2008-01-23 20:04:22 UTC (rev 896)
@@ -62,7 +62,7 @@
GObject parent;
/** The channel unique ID. */
- GString *chanid;
+ gint xx_channel_id;
/** The program start time. */
GTimeVal *startts;
/** The program end time. */
@@ -90,7 +90,7 @@
GString *seriesid;
/** The program unique id. */
- GString *programid;
+ GString *xx_program_id;
GString *catType;
GString *sortTitle;
Modified: trunk/gmyth/src/gmyth_recorder.c
===================================================================
--- trunk/gmyth/src/gmyth_recorder.c 2008-01-15 17:44:34 UTC (rev 895)
+++ trunk/gmyth/src/gmyth_recorder.c 2008-01-23 20:04:22 UTC (rev 896)
@@ -917,7 +917,7 @@
gmyth_string_list_append_string(str_list, tmp_str);
gmyth_string_list_append_char_array(str_list, "GET_NEXT_PROGRAM_INFO");
gmyth_string_list_append_string(str_list, actual_proginfo->channame);
- gmyth_string_list_append_string(str_list, actual_proginfo->chanid);
+ gmyth_string_list_append_int(str_list, actual_proginfo->xx_channel_id);
gmyth_string_list_append_int(str_list, direction);
gmyth_string_list_append_char_array(str_list, date);
Modified: trunk/gmyth/src/gmyth_scheduler.c
===================================================================
--- trunk/gmyth/src/gmyth_scheduler.c 2008-01-15 17:44:34 UTC (rev 895)
+++ trunk/gmyth/src/gmyth_scheduler.c 2008-01-23 20:04:22 UTC (rev 896)
@@ -31,6 +31,7 @@
#include <assert.h>
+#include <glib.h>
#include <glib/gprintf.h>
#include "gmyth_scheduler.h"
@@ -244,8 +245,8 @@
schedule->schedule_id =
(guint) g_ascii_strtoull(row[0], NULL, 10);
- schedule->program_id = g_string_new (row[1]);
- schedule->channel_id = g_string_new (row[2]);
+ schedule->xx_program_id = g_string_new (row[1]);
+ schedule->xx_channel_id = (gint) g_ascii_strtoull (row[2], NULL, 10);
/*
* generate a time_t from a time and a date db field
@@ -331,9 +332,8 @@
record = g_new0(RecordedInfo, 1);
record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10);
- record->program_id =
- (guint) g_ascii_strtoull(row[1], NULL, 10);
- record->channel_id = g_string_new (row[2]);
+ record->xx_program_id = g_string_new (row[1]);
+ record->xx_channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
record->start_time = gmyth_util_string_to_time_val(row[3]);
record->end_time = gmyth_util_string_to_time_val(row[5]);
@@ -390,8 +390,8 @@
if (row != NULL) {
record = g_new0(RecordedInfo, 1);
record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10);
- record->program_id = (guint) g_ascii_strtoull(row[1], NULL, 10);
- record->channel_id = g_string_new (row[2]);
+ record->xx_program_id = g_string_new (row[1]);
+ record->xx_channel_id = (gint) g_ascii_strtoull(row[2], NULL, 10);
record->start_time = gmyth_util_string_to_time_val(row[3]);
record->end_time = gmyth_util_string_to_time_val(row[5]);
record->title = g_string_new(row[7]);
@@ -442,8 +442,8 @@
ScheduleInfo *info;
info = g_new0 (ScheduleInfo, 1);
- info->program_id = g_string_new (program->programid->str);
- info->channel_id = g_string_new (program->chanid->str);
+ info->xx_program_id = g_string_new (program->xx_program_id->str);
+ info->xx_channel_id = program->xx_channel_id;
info->start_time = g_new0 (GTimeVal, 1);
*info->start_time = *program->startts;
info->end_time = g_new0 (GTimeVal, 1);
@@ -483,7 +483,7 @@
gchar *station = NULL;
gulong rec_id;
- assert(scheduler);
+ g_return_val_if_fail (IS_GMYTH_SCHEDULER (scheduler), FALSE);
if (scheduler->msqlquery == NULL) {
g_warning("[%s] Scheduler db connection not initialized",
@@ -499,8 +499,8 @@
// Retrieves the station info
query_str =
g_strdup_printf
- ("SELECT callsign FROM channel WHERE chanid = \"%s\";",
- schedule_info->channel_id->str);
+ ("SELECT callsign FROM channel WHERE chanid = %d;",
+ schedule_info->xx_channel_id);
msql_res =
gmyth_query_process_statement(scheduler->msqlquery, query_str);
if (msql_res == NULL) {
@@ -517,8 +517,8 @@
g_free(query_str);
// _set_value (field, value, id);
- _set_value(scheduler->msqlquery, "chanid",
- schedule_info->channel_id->str, rec_id);
+ _set_int_value(scheduler->msqlquery, "chanid",
+ schedule_info->xx_channel_id, rec_id);
_set_value(scheduler->msqlquery, "station", station, rec_id);
_set_value(scheduler->msqlquery, "title", schedule_info->title->str,
rec_id);
@@ -546,8 +546,10 @@
// (gint)(schedule_info->start_time->tv_sec/60/60/24 + 719528),
// rec_id);
- _set_value(scheduler->msqlquery, "seriesid",
- schedule_info->seriesid->str, rec_id);
+ if (schedule_info->seriesid)
+ _set_value(scheduler->msqlquery, "seriesid",
+ schedule_info->seriesid->str, rec_id);
+
_set_value(scheduler->msqlquery, "parentid", "0", rec_id);
_set_value(scheduler->msqlquery, "search", "0", rec_id);
@@ -811,7 +813,7 @@
if (msql_row) {
proginfo = gmyth_program_info_new();
- proginfo->chanid = g_string_new(msql_row[0]);
+ proginfo->xx_channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
proginfo->recstartts = gmyth_util_string_to_time_val(msql_row[1]);
proginfo->recendts = gmyth_util_string_to_time_val(msql_row[2]);
@@ -825,7 +827,7 @@
proginfo->chancommfree = (gint) g_ascii_strtoull(msql_row[9], NULL, 10);
proginfo->chanOutputFilters = g_string_new(msql_row[10]);
proginfo->seriesid = g_string_new(msql_row[11]);
- proginfo->programid = g_string_new(msql_row[12]);
+ proginfo->xx_program_id = g_string_new(msql_row[12]);
proginfo->filesize = g_ascii_strtoull(msql_row[13], NULL, 10);
proginfo->lastmodified = gmyth_util_string_to_time_val(msql_row[14]);
@@ -959,7 +961,7 @@
if (msql_row) {
proginfo = gmyth_program_info_new();
- proginfo->chanid = g_string_new(msql_row[0]);
+ proginfo->xx_channel_id = (gint) g_ascii_strtoull (msql_row[0], NULL, 10);
proginfo->startts =
gmyth_util_string_to_time_val(msql_row[23]);
proginfo->endts = gmyth_util_string_to_time_val(msql_row[24]);
@@ -978,7 +980,7 @@
(gint) g_ascii_strtoull(msql_row[9], NULL, 10);
proginfo->chanOutputFilters = g_string_new(msql_row[10]);
proginfo->seriesid = g_string_new(msql_row[11]);
- proginfo->programid = g_string_new(msql_row[12]);
+ proginfo->xx_program_id = g_string_new(msql_row[12]);
proginfo->filesize = g_ascii_strtoull(msql_row[13], NULL, 10);
proginfo->lastmodified =
@@ -1042,7 +1044,7 @@
gmyth_string_list_append_string(slist, program->subtitle); /* 1 */
gmyth_string_list_append_string(slist, program->description); /* 2 */
gmyth_string_list_append_string(slist, program->category); /* 3 */
- gmyth_string_list_append_string(slist, program->chanid); /* 4 */
+ gmyth_string_list_append_int(slist, program->xx_channel_id); /* 4 */
gmyth_string_list_append_string(slist, program->chanstr); /* 5 */
gmyth_string_list_append_string(slist, program->chansign); /* 6 */
gmyth_string_list_append_string(slist, program->channame); /* 7 */
@@ -1098,7 +1100,7 @@
gmyth_string_list_append_int(slist, program->chancommfree); /* 31 */
gmyth_string_list_append_string(slist, program->chanOutputFilters); /* 32 */
gmyth_string_list_append_string(slist, program->seriesid); /* 33 */
- gmyth_string_list_append_string(slist, program->programid); /* 34 */
+ gmyth_string_list_append_string(slist, program->xx_program_id); /* 34 */
gmyth_string_list_append_int(slist,
program->lastmodified != NULL ?
@@ -1170,9 +1172,11 @@
void
gmyth_recorded_info_free(RecordedInfo * info)
{
- if (info->channel_id)
- g_string_free (info->channel_id, TRUE);
+ g_return_if_fail (info != NULL);
+ if (info->xx_program_id)
+ g_string_free (info->xx_program_id, TRUE);
+
if (info->title != NULL)
g_string_free(info->title, TRUE);
@@ -1220,8 +1224,8 @@
g_return_if_fail(info != NULL);
- if (info->channel_id)
- g_string_free (info->channel_id, TRUE);
+ if (info->xx_program_id)
+ g_string_free (info->xx_program_id, TRUE);
if (info->title != NULL)
g_string_free(info->title, TRUE);
Modified: trunk/gmyth/src/gmyth_scheduler.h
===================================================================
--- trunk/gmyth/src/gmyth_scheduler.h 2008-01-15 17:44:34 UTC (rev 895)
+++ trunk/gmyth/src/gmyth_scheduler.h 2008-01-23 20:04:22 UTC (rev 896)
@@ -99,8 +99,8 @@
typedef struct {
guint schedule_id;
- GString *program_id;
- GString *channel_id;
+ gint xx_channel_id;
+ GString *xx_program_id;
GTimeVal *start_time;
GTimeVal *end_time;
@@ -119,8 +119,8 @@
typedef struct {
guint record_id;
- guint program_id;
- GString *channel_id;
+ gint xx_channel_id;
+ GString *xx_program_id;
GTimeVal *start_time;
GTimeVal *end_time;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-15 17:44:33
|
Revision: 895
http://gmyth.svn.sourceforge.net/gmyth/?rev=895&view=rev
Author: renatofilho
Date: 2008-01-15 09:44:34 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
fixed bug with uint properties
Modified Paths:
--------------
trunk/gmyth-stream/gmencoder/src/gmencoder.c
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-07 18:49:22 UTC (rev 894)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-15 17:44:34 UTC (rev 895)
@@ -228,6 +228,9 @@
case G_TYPE_INT:
g_value_set_int(&p, atoi(prop_val));
break;
+ case G_TYPE_UINT:
+ g_value_set_uint (&p, (guint) atoi(prop_val));
+ break;
case G_TYPE_ULONG:
g_value_set_ulong (&p, atol(prop_val));
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-07 18:49:22
|
Revision: 894
http://gmyth.svn.sourceforge.net/gmyth/?rev=894&view=rev
Author: renatofilho
Date: 2008-01-07 10:49:22 -0800 (Mon, 07 Jan 2008)
Log Message:
-----------
removed hardcode bitrate;
Modified Paths:
--------------
trunk/gmyth-stream/gmencoder/debian/changelog
trunk/gmyth-stream/gmencoder/src/gmencoder.c
Modified: trunk/gmyth-stream/gmencoder/debian/changelog
===================================================================
--- trunk/gmyth-stream/gmencoder/debian/changelog 2008-01-04 16:46:07 UTC (rev 893)
+++ trunk/gmyth-stream/gmencoder/debian/changelog 2008-01-07 18:49:22 UTC (rev 894)
@@ -1,3 +1,15 @@
+gmencoder (0.2-indt1) gutsy; urgency=low
+
+ * Bugs fix
+
+ -- Hallyson Melo <hal...@in...> Wed, 07 Jan 2008 10:35:00 -0300
+
+gmencoder (0.1-indt1) gutsy; urgency=low
+
+ * release 11/21/2007
+
+ -- Hallyson Melo <hal...@in...> Wed, 17 Sep 2007 17:12:00 -0300
+
gmencoder (0.1-indt1) unstable; urgency=low
* Initial release
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-04 16:46:07 UTC (rev 893)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-07 18:49:22 UTC (rev 894)
@@ -308,7 +308,6 @@
goto error;
}
- g_object_set(G_OBJECT(aencode), "bitrate", 32, NULL);
/*
* if (rate > 0) { g_object_set (G_OBJECT (aencode), "bitrate", 32,
* NULL); }
@@ -371,7 +370,7 @@
GstElement *vcolorspace = NULL;
GstElement *vencode = NULL;
GstElement *vrate = NULL;
- GstElement *deinterlace = NULL;
+ GstElement *deinterlace = NULL;
GstElement *walk = NULL;
GstPad *vpad = NULL;
@@ -382,8 +381,8 @@
if (use_deinterlace) {
deinterlace = gst_element_factory_make ("ffdeinterlace", "deinterlace");
- if (deinterlace == NULL) {
- g_warning ("Fail to create deinterlace element: Continue without deinterlace.");
+ if (deinterlace == NULL) {
+ g_warning ("Fail to create deinterlace element: Continue without deinterlace.");
}
}
@@ -414,11 +413,10 @@
if ((width > 0) && (height > 0)) {
// Scalling video
GstCaps *vcaps;
- GstElement *vscale =
- gst_element_factory_make("videoscale", "vscale");
+ GstElement *vscale;
- g_object_set (G_OBJECT (vscale), "method", 1, NULL);
-
+ vscale = gst_element_factory_make("videoscale", "vscale");
+ //g_object_set (G_OBJECT (vscale), "method", 1, NULL);
gst_bin_add(GST_BIN(vbin), vscale);
vcaps = gst_caps_new_simple("video/x-raw-yuv",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-04 16:46:11
|
Revision: 893
http://gmyth.svn.sourceforge.net/gmyth/?rev=893&view=rev
Author: renatofilho
Date: 2008-01-04 08:46:07 -0800 (Fri, 04 Jan 2008)
Log Message:
-----------
automatized changelog dist var
Modified Paths:
--------------
trunk/gmyth/configure.ac
Added Paths:
-----------
trunk/gmyth/debian/changelog.in
Removed Paths:
-------------
trunk/gmyth/debian/changelog
Modified: trunk/gmyth/configure.ac
===================================================================
--- trunk/gmyth/configure.ac 2007-12-21 14:07:54 UTC (rev 892)
+++ trunk/gmyth/configure.ac 2008-01-04 16:46:07 UTC (rev 893)
@@ -37,6 +37,7 @@
DX_PS_FEATURE(OFF)
DX_INIT_DOXYGEN(gmyth, doxygen.cfg, docs)
+
# Checks for libraries.
# Checks for header files.
@@ -297,8 +298,17 @@
AC_SUBST(LDFLAGS)
AC_SUBST(LIBS)
+#pkg debian flags
+DISTRIB_CODENAME="$(cat /etc/lsb-release | grep DISTRIB_CODENAME | cut -d'=' -f2)"
+if test "x$DISTRIB_CODENAME" = "x"; then
+ DISTRIB_CODENAME="chinook"
+fi
+AC_SUBST(DISTRIB_CODENAME)
+
+
AC_OUTPUT([
Makefile
+debian/changelog
src/Makefile
samples/Makefile
tests/Makefile
@@ -308,5 +318,5 @@
AC_MSG_NOTICE([Debug: Enabled])
else
AC_MSG_NOTICE([Debug: Disabled])
-fi
+fi
Deleted: trunk/gmyth/debian/changelog
===================================================================
--- trunk/gmyth/debian/changelog 2007-12-21 14:07:54 UTC (rev 892)
+++ trunk/gmyth/debian/changelog 2008-01-04 16:46:07 UTC (rev 893)
@@ -1,35 +0,0 @@
-gmyth (0.4.2-chinook-indt1) unstable; urgency=low
-
- * Patch from Tim Philipp to fix debian/control libcurl dependency
-
- -- Hallyson Melo <hal...@in...> Mon, 08 Oct 2007 10:49:19 -0300
-
-gmyth (0.4-indt1) unstable; urgency=low
-
- * Bug fixes
- * Improvements in the schedule management (add all schedule, add exception, ...)
- * GMythBackendInfo now has db_port
-
- -- Hallyson Melo <hal...@in...> Thu, 22 Aug 2007 14:46:08 -0300
-
-gmyth (0.3) unstable; urgency=low
-
- * Update file_reader an serveral bug fixes;
-
- -- Renato Araujo <ren...@in...> Thu, 12 Apr 2007 14:46:08 -0300
-
-gmyth (0.2) unstable; urgency=low
-
- * Included several http_requests in order to replace mysql queries (MythProtocol >= 33)
- * Included remote file transcoding request and jobqueue request (need to apply patch)
- * Included recording profile management (need to apply patch)
- * Several bug fixes
-
- -- Hallyson Melo <hal...@in...> Mon, 5 Mar 2007 14:46:08 -0300
-
-gmyth (0.1) unstable; urgency=low
-
- * Initial Maemo Package.
-
- -- Hallyson Melo <hal...@in...> Fri, 15 Sep 2006 10:26:16 -0300
-
Added: trunk/gmyth/debian/changelog.in
===================================================================
--- trunk/gmyth/debian/changelog.in (rev 0)
+++ trunk/gmyth/debian/changelog.in 2008-01-04 16:46:07 UTC (rev 893)
@@ -0,0 +1,41 @@
+gmyth (0.5-indt1) @DISTRIB_CODENAME@; urgency=low
+
+ * bug fixes;
+
+ -- Renato Araujo <ren...@in...> Fri, 04 Jan 2008 11:16:08 -0300
+
+gmyth (0.4.2-chinook-indt1) unstable; urgency=low
+
+ * Patch from Tim Philipp to fix debian/control libcurl dependency
+
+ -- Hallyson Melo <hal...@in...> Mon, 08 Oct 2007 10:49:19 -0300
+
+gmyth (0.4-indt1) unstable; urgency=low
+
+ * Bug fixes
+ * Improvements in the schedule management (add all schedule, add exception, ...)
+ * GMythBackendInfo now has db_port
+
+ -- Hallyson Melo <hal...@in...> Thu, 22 Aug 2007 14:46:08 -0300
+
+gmyth (0.3) unstable; urgency=low
+
+ * Update file_reader an serveral bug fixes;
+
+ -- Renato Araujo <ren...@in...> Thu, 12 Apr 2007 14:46:08 -0300
+
+gmyth (0.2) unstable; urgency=low
+
+ * Included several http_requests in order to replace mysql queries (MythProtocol >= 33)
+ * Included remote file transcoding request and jobqueue request (need to apply patch)
+ * Included recording profile management (need to apply patch)
+ * Several bug fixes
+
+ -- Hallyson Melo <hal...@in...> Mon, 5 Mar 2007 14:46:08 -0300
+
+gmyth (0.1) unstable; urgency=low
+
+ * Initial Maemo Package.
+
+ -- Hallyson Melo <hal...@in...> Fri, 15 Sep 2006 10:26:16 -0300
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-12-21 14:07:51
|
Revision: 892
http://gmyth.svn.sourceforge.net/gmyth/?rev=892&view=rev
Author: renatofilho
Date: 2007-12-21 06:07:54 -0800 (Fri, 21 Dec 2007)
Log Message:
-----------
create help function: gmyth_scheduler_add_schedule_program
Modified Paths:
--------------
trunk/gmyth/debian/changelog
trunk/gmyth/src/gmyth_common.h
trunk/gmyth/src/gmyth_epg.c
trunk/gmyth/src/gmyth_scheduler.c
trunk/gmyth/src/gmyth_scheduler.h
Modified: trunk/gmyth/debian/changelog
===================================================================
--- trunk/gmyth/debian/changelog 2007-11-21 15:14:05 UTC (rev 891)
+++ trunk/gmyth/debian/changelog 2007-12-21 14:07:54 UTC (rev 892)
@@ -1,4 +1,4 @@
-gmyth (0.4.1-indt1) unstable; urgency=low
+gmyth (0.4.2-chinook-indt1) unstable; urgency=low
* Patch from Tim Philipp to fix debian/control libcurl dependency
Modified: trunk/gmyth/src/gmyth_common.h
===================================================================
--- trunk/gmyth/src/gmyth_common.h 2007-11-21 15:14:05 UTC (rev 891)
+++ trunk/gmyth/src/gmyth_common.h 2007-12-21 14:07:54 UTC (rev 892)
@@ -34,10 +34,10 @@
#include "gmyth_programinfo.h"
G_BEGIN_DECLS
-/**
- * The GMythChannelInfo structure represents the channel information
- * stored in the backend database.
- */
+ /**
+ * The GMythChannelInfo structure represents the channel information
+ * stored in the backend database.
+ */
typedef struct {
/** The channel ID in backend database */
gint channel_ID;
@@ -50,7 +50,6 @@
/** The channel icon path in the backend database */
GString *channel_icon;
-
} GMythChannelInfo;
void gmyth_free_channel_list (GList *list);
Modified: trunk/gmyth/src/gmyth_epg.c
===================================================================
--- trunk/gmyth/src/gmyth_epg.c 2007-11-21 15:14:05 UTC (rev 891)
+++ trunk/gmyth/src/gmyth_epg.c 2007-12-21 14:07:54 UTC (rev 892)
@@ -266,10 +266,17 @@
" channel.name, program.previouslyshown, channel.commfree, "
" channel.outputfilters, program.seriesid, program.programid, "
" program.airdate, program.stars, program.originalairdate, "
- " program.category_type, oldrecstatus.recordid, "
+ " program.category_type, record.recordid, "
" oldrecstatus.rectype, oldrecstatus.recstatus, "
- " oldrecstatus.findid " "FROM program "
+ " oldrecstatus.findid "
+ "FROM program "
"LEFT JOIN channel ON program.chanid = channel.chanid "
+ "LEFT JOIN record ON "
+ " program.chanid = record.chanid AND "
+ " DATE (program.starttime) = record.startdate AND "
+ " TIME (program.starttime) = record.starttime AND "
+ " DATE (program.endtime) = record.enddate AND "
+ " TIME (program.endtime) = record.endtime "
"LEFT JOIN oldrecorded AS oldrecstatus ON "
" program.title = oldrecstatus.title AND "
" channel.callsign = oldrecstatus.station AND "
@@ -321,6 +328,7 @@
p->lastmodified->tv_sec = p->startts->tv_sec;
p->lastmodified->tv_usec = p->startts->tv_usec;
+
p->title = g_string_new(row[3]);
p->subtitle = g_string_new(row[4]);
p->description = g_string_new(row[5]);
@@ -345,6 +353,8 @@
}
p->catType = g_string_new(row[18]);
+ if (row[19] != NULL)
+ p->recordid = g_ascii_strtoull(row[19], NULL, 10);
*proglist = g_list_append(*proglist, p);
Modified: trunk/gmyth/src/gmyth_scheduler.c
===================================================================
--- trunk/gmyth/src/gmyth_scheduler.c 2007-11-21 15:14:05 UTC (rev 891)
+++ trunk/gmyth/src/gmyth_scheduler.c 2007-12-21 14:07:54 UTC (rev 892)
@@ -219,7 +219,7 @@
g_string_printf(query_str,
"SELECT recordid,programid,chanid,starttime,startdate,"
- "endtime,enddate,title,subtitle,description,category,type,parentid FROM record;");
+ "endtime,enddate,title,subtitle,description,category,type,parentid,seriesid FROM record;");
if (scheduler->msqlquery == NULL) {
g_warning("[%s] Scheduler db connection not initialized",
@@ -244,10 +244,8 @@
schedule->schedule_id =
(guint) g_ascii_strtoull(row[0], NULL, 10);
- schedule->program_id =
- (guint) g_ascii_strtoull(row[1], NULL, 10);
- schedule->channel_id =
- (guint) g_ascii_strtoull(row[2], NULL, 10);
+ schedule->program_id = g_string_new (row[1]);
+ schedule->channel_id = g_string_new (row[2]);
/*
* generate a time_t from a time and a date db field
@@ -278,6 +276,8 @@
schedule->parentid = (gint) g_ascii_strtoull (row[12], NULL, 10);
}
+ schedule->seriesid = g_string_new (row[13]);
+
(*schedule_list) = g_list_append(*(schedule_list), schedule);
}
}
@@ -307,7 +307,7 @@
g_string_printf(query_str,
"SELECT recordid,programid,chanid,starttime,progstart,"
"endtime,progend,title,subtitle,description,category,"
- "filesize,basename FROM recorded WHERE recgroup != 'LiveTV'");
+ "filesize,basename,seriesid FROM recorded WHERE recgroup != 'LiveTV'");
if (scheduler->msqlquery == NULL) {
g_warning("[%s] Scheduler db connection not initialized",
@@ -333,9 +333,7 @@
record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10);
record->program_id =
(guint) g_ascii_strtoull(row[1], NULL, 10);
- record->channel_id =
- (guint) g_ascii_strtoull(row[2], NULL, 10);
-
+ record->channel_id = g_string_new (row[2]);
record->start_time = gmyth_util_string_to_time_val(row[3]);
record->end_time = gmyth_util_string_to_time_val(row[5]);
@@ -345,6 +343,7 @@
record->category = g_string_new(row[10]);
record->filesize = g_ascii_strtoull(row[11], NULL, 10);
record->basename = g_string_new(row[12]);
+ record->seriesid = g_string_new(row[13]);
(*recorded_list) = g_list_append((*recorded_list), record);
}
@@ -369,7 +368,7 @@
g_string_printf(query_str,
"SELECT recordid,programid,chanid,starttime,progstart,"
"endtime,progend,title,subtitle,description,category,"
- "filesize,basename FROM recorded "
+ "filesize,basename,seriesid FROM recorded "
"WHERE recgroup != 'LiveTV' AND basename = '%s'", basename);
if (scheduler->msqlquery == NULL) {
@@ -392,7 +391,7 @@
record = g_new0(RecordedInfo, 1);
record->record_id = (guint) g_ascii_strtoull(row[0], NULL, 10);
record->program_id = (guint) g_ascii_strtoull(row[1], NULL, 10);
- record->channel_id = (guint) g_ascii_strtoull(row[2], NULL, 10);
+ record->channel_id = g_string_new (row[2]);
record->start_time = gmyth_util_string_to_time_val(row[3]);
record->end_time = gmyth_util_string_to_time_val(row[5]);
record->title = g_string_new(row[7]);
@@ -401,6 +400,7 @@
record->category = g_string_new(row[10]);
record->filesize = g_ascii_strtoull(row[11], NULL, 10);
record->basename = g_string_new(row[12]);
+ record->seriesid = g_string_new(row[13]);
}
}
@@ -434,6 +434,46 @@
g_free(str_value);
}
+ScheduleInfo*
+gmyth_scheduler_add_schedule_program (GMythScheduler * scheduler,
+ GMythProgramInfo *program,
+ GMythScheduleType type)
+{
+ ScheduleInfo *info;
+
+ info = g_new0 (ScheduleInfo, 1);
+ info->program_id = g_string_new (program->programid->str);
+ info->channel_id = g_string_new (program->chanid->str);
+ info->start_time = g_new0 (GTimeVal, 1);
+ *info->start_time = *program->startts;
+ info->end_time = g_new0 (GTimeVal, 1);
+ *info->end_time = *program->endts;
+ info->seriesid = g_string_new (program->seriesid->str);
+ info->title = g_string_new (program->title->str);
+ info->subtitle = g_string_new (program->subtitle->str);
+ info->description = g_string_new (program->description->str);
+ info->category = g_string_new (program->category->str);
+ info->type = type;
+
+ if (gmyth_scheduler_add_schedule_full (scheduler, info, type))
+ {
+ if (!program->recstartts)
+ program->recstartts = g_new0 (GTimeVal, 1);
+ *program->recstartts = *info->start_time;
+
+ if (!program->recendts)
+ program->recendts = g_new0 (GTimeVal, 1);
+ *program->recendts = *info->end_time;
+
+ program->recordid = info->schedule_id;
+ return info;
+ }
+
+ gmyth_schedule_info_free (info);
+ return NULL;
+}
+
+
gboolean
gmyth_scheduler_add_schedule_full (GMythScheduler * scheduler,
ScheduleInfo * schedule_info, GMythScheduleType type)
@@ -459,8 +499,8 @@
// Retrieves the station info
query_str =
g_strdup_printf
- ("SELECT callsign FROM channel WHERE chanid = \"%d\";",
- schedule_info->channel_id);
+ ("SELECT callsign FROM channel WHERE chanid = \"%s\";",
+ schedule_info->channel_id->str);
msql_res =
gmyth_query_process_statement(scheduler->msqlquery, query_str);
if (msql_res == NULL) {
@@ -477,8 +517,8 @@
g_free(query_str);
// _set_value (field, value, id);
- _set_int_value(scheduler->msqlquery, "chanid",
- schedule_info->channel_id, rec_id);
+ _set_value(scheduler->msqlquery, "chanid",
+ schedule_info->channel_id->str, rec_id);
_set_value(scheduler->msqlquery, "station", station, rec_id);
_set_value(scheduler->msqlquery, "title", schedule_info->title->str,
rec_id);
@@ -506,6 +546,8 @@
// (gint)(schedule_info->start_time->tv_sec/60/60/24 + 719528),
// rec_id);
+ _set_value(scheduler->msqlquery, "seriesid",
+ schedule_info->seriesid->str, rec_id);
_set_value(scheduler->msqlquery, "parentid", "0", rec_id);
_set_value(scheduler->msqlquery, "search", "0", rec_id);
@@ -1128,6 +1170,9 @@
void
gmyth_recorded_info_free(RecordedInfo * info)
{
+ if (info->channel_id)
+ g_string_free (info->channel_id, TRUE);
+
if (info->title != NULL)
g_string_free(info->title, TRUE);
@@ -1175,6 +1220,9 @@
g_return_if_fail(info != NULL);
+ if (info->channel_id)
+ g_string_free (info->channel_id, TRUE);
+
if (info->title != NULL)
g_string_free(info->title, TRUE);
Modified: trunk/gmyth/src/gmyth_scheduler.h
===================================================================
--- trunk/gmyth/src/gmyth_scheduler.h 2007-11-21 15:14:05 UTC (rev 891)
+++ trunk/gmyth/src/gmyth_scheduler.h 2007-12-21 14:07:54 UTC (rev 892)
@@ -99,12 +99,13 @@
typedef struct {
guint schedule_id;
- guint program_id;
- guint channel_id;
+ GString *program_id;
+ GString *channel_id;
GTimeVal *start_time;
GTimeVal *end_time;
+ GString *seriesid;
GString *title;
GString *subtitle;
GString *description;
@@ -119,11 +120,12 @@
typedef struct {
guint record_id;
guint program_id;
- guint channel_id;
+ GString *channel_id;
GTimeVal *start_time;
GTimeVal *end_time;
+ GString *seriesid;
GString *title;
GString *subtitle;
GString *description;
@@ -162,6 +164,9 @@
GMythProgramInfo* gmyth_scheduler_get_recorded (GMythScheduler * scheduler,
GString * channel,
GTimeVal * starttime);
+ScheduleInfo* gmyth_scheduler_add_schedule_program (GMythScheduler * scheduler,
+ GMythProgramInfo *program,
+ GMythScheduleType type);
gint gmyth_scheduler_add_schedule (GMythScheduler * scheduler,
ScheduleInfo * schedule_info);
gboolean gmyth_scheduler_add_schedule_full (GMythScheduler * scheduler,
@@ -170,7 +175,7 @@
gboolean gmyth_scheduler_add_exception (GMythScheduler *scheduler,
gint schedule_id,
ScheduleInfo *exception_info);
-gint gmyth_scheduler_delete_schedule (GMythScheduler * scheduler,
+gboolean gmyth_scheduler_delete_schedule (GMythScheduler * scheduler,
gint record_id);
gint gmyth_scheduler_delete_recorded (GMythScheduler * scheduler,
gint record_id);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-11-21 15:14:04
|
Revision: 891
http://gmyth.svn.sourceforge.net/gmyth/?rev=891&view=rev
Author: renatofilho
Date: 2007-11-21 07:14:05 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
removed g_debug call
Modified Paths:
--------------
trunk/gst-gmyth/nuvdemux/gstnuvdemux.c
Modified: trunk/gst-gmyth/nuvdemux/gstnuvdemux.c
===================================================================
--- trunk/gst-gmyth/nuvdemux/gstnuvdemux.c 2007-11-21 15:06:32 UTC (rev 890)
+++ trunk/gst-gmyth/nuvdemux/gstnuvdemux.c 2007-11-21 15:14:05 UTC (rev 891)
@@ -883,7 +883,6 @@
}
if ((h.i_timecode > 0) && (h.i_type == 'V')) {
- g_debug ("TS: %ld", h.i_timecode);
timestamp = h.i_timecode * GST_MSECOND;
GST_BUFFER_TIMESTAMP(buf) = timestamp;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-11-21 15:06:28
|
Revision: 890
http://gmyth.svn.sourceforge.net/gmyth/?rev=890&view=rev
Author: renatofilho
Date: 2007-11-21 07:06:32 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
fixed dbname on backendinfo constructor; fixed uri livetv detect
Modified Paths:
--------------
trunk/gmyth/src/gmyth_backendinfo.c
trunk/gmyth/src/gmyth_uri.c
Modified: trunk/gmyth/src/gmyth_backendinfo.c
===================================================================
--- trunk/gmyth/src/gmyth_backendinfo.c 2007-11-21 13:10:19 UTC (rev 889)
+++ trunk/gmyth/src/gmyth_backendinfo.c 2007-11-21 15:06:32 UTC (rev 890)
@@ -155,6 +155,7 @@
GMythBackendInfo *backend_info;
GMythURI *uri;
gchar **path_parts;
+ gchar *db;
backend_info = GMYTH_BACKEND_INFO(g_object_new(GMYTH_BACKEND_INFO_TYPE, NULL));
uri = gmyth_uri_new_with_value (uri_str);
@@ -168,13 +169,17 @@
* gets the path info to database name, from the URI, and removes the
* trash chars
*/
- gmyth_backend_info_set_db_name(backend_info, path_parts != NULL &&
- strlen(path_parts[0]) > 0 ?
- g_strstrip(g_strdelimit
- (path_parts[0], "/?",
- ' ')) :
- gmyth_uri_get_path(uri));
+ if ((path_parts != NULL) && (strlen (path_parts[0]) > 0))
+ {
+ db = path_parts[0]+2;
+ }
+ else
+ {
+ db = gmyth_uri_get_path(uri);
+ }
+ gmyth_backend_info_set_db_name(backend_info, db);
+
gmyth_backend_info_set_port(backend_info, gmyth_uri_get_port(uri));
g_object_unref(uri);
Modified: trunk/gmyth/src/gmyth_uri.c
===================================================================
--- trunk/gmyth/src/gmyth_uri.c 2007-11-21 13:10:19 UTC (rev 889)
+++ trunk/gmyth/src/gmyth_uri.c 2007-11-21 15:06:32 UTC (rev 890)
@@ -472,7 +472,7 @@
g_return_val_if_fail(uri->uri != NULL, FALSE);
g_return_val_if_fail(uri->uri->str != NULL, FALSE);
- if ((strstr(uri->uri->str, "channel") == NULL) ||
+ if ((strstr(uri->uri->str, "channel=") == NULL) &&
(strstr(uri->uri->str, "livetv") == NULL))
ret = FALSE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-11-21 13:10:21
|
Revision: 889
http://gmyth.svn.sourceforge.net/gmyth/?rev=889&view=rev
Author: renatofilho
Date: 2007-11-21 05:10:19 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
updated to use theora
Modified Paths:
--------------
trunk/gmyth-stream/server/lib/request_handler.py
trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py
trunk/gmyth-stream/server/plugins/transcoders/mencoder.py
Modified: trunk/gmyth-stream/server/lib/request_handler.py
===================================================================
--- trunk/gmyth-stream/server/lib/request_handler.py 2007-11-19 18:06:11 UTC (rev 888)
+++ trunk/gmyth-stream/server/lib/request_handler.py 2007-11-21 13:10:19 UTC (rev 889)
@@ -411,9 +411,9 @@
def serve_transcode(self, body):
type = self.query.get("type", None)[0]
- if type.upper() == "FILE":
- self.send_error(404, "Transcode local files not allowed")
- return
+ #if type.upper() == "FILE":
+ # self.send_error(404, "Transcode local files not allowed")
+ # #return
transcoder = self._get_transcoder()
try:
Modified: trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py
===================================================================
--- trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py 2007-11-19 18:06:11 UTC (rev 888)
+++ trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py 2007-11-21 13:10:19 UTC (rev 889)
@@ -46,14 +46,14 @@
self._insert_param("-i", \
"%s://%s" % (self.params_first("type", "file"),
self.params_first("uri", "")))
- self._insert_param("--video-encode", self.params_first("ve", "ffenc_mpeg1video"))
- self._insert_param("--video-opts", "bitrate=300000,pass=512,quantizer=0.01,quant-type=1")
- #self._insert_param("--video-fps", self.params_first("fps", ""))
+ self._insert_param("--video-encode", self.params_first("ve", "theoraenc"))
+ self._insert_param("--video-opts", self.params_first ("video-opts", "quality=30,sharpness=2"))
self._insert_param("--video-fps", self.params_first("fps", "10"))
- self._insert_param("--video-width", self.params_first("width", "320"))
- self._insert_param("--video-height", self.params_first("height", "240"))
- self._insert_param("--audio-rate", "32000")
- self._insert_param("--audio-encode", self.params_first("ae", ""))
+ self._insert_param("--video-width", self.params_first("width", "240"))
+ self._insert_param("--video-height", self.params_first("height", "144"))
+ self._insert_param("--audio-encode", self.params_first("ae", "vorbisenc"))
+ self._insert_param("--audio-opts", self.params_first ("audio-opts", "managed=true"))
+ self._insert_param("--mux-element", self.params_first("mux", "oggmux"))
# _parse_params
def start(self, outfd):
@@ -72,8 +72,8 @@
self.proc = subprocess.Popen(self.opts, stdin=subprocess.PIPE,
stdout=subprocess.PIPE)
- if outfile:
- outfd.write("OK ")
+ if outfile:
+ outfd.write("OK ")
except Exception, e:
self.log.error(self.tid, "Error: executing GMencoder: %s" % e)
Modified: trunk/gmyth-stream/server/plugins/transcoders/mencoder.py
===================================================================
--- trunk/gmyth-stream/server/plugins/transcoders/mencoder.py 2007-11-19 18:06:11 UTC (rev 888)
+++ trunk/gmyth-stream/server/plugins/transcoders/mencoder.py 2007-11-21 13:10:19 UTC (rev 889)
@@ -42,7 +42,6 @@
self.args["local"] = params_first("local", False)
self.args["language"] = params_first("language", False)
self.args["subtitle"] = params_first("subtitle", False)
- self.args["format"] = params_first("format", "mpeg1")
self.args["outfile"] = params_first("outfile", "-")
# input_opt
@@ -50,16 +49,15 @@
self.args["input"] = params_first("uri", "-")
# audio_opts
- self.args["acodec"] = params_first("acodec", "mp2")
- self.args["abitrate"] = params_first("abitrate", 192)
- self.args["volume"] = params_first("volume", 5)
+ self.args["acodec"] = params_first("acodec", "mp3lame")
+ self.args["abitrate"] = params_first("abitrate", 128)
+ self.args["volume"] = params_first("volume", 9)
# video_opts
- self.args["mux"] = params_first("mux", "mpeg")
self.args["fps"] = params_first("fps", 25)
- self.args["vcodec"] = params_first("vcodec", "mpeg1video")
- self.args["vbitrate"] = params_first("vbitrate", 400)
- self.args["width"] = params_first("width", 320)
+ self.args["vcodec"] = params_first("vcodec", "msmpeg4v2")
+ self.args["vbitrate"] = params_first("vbitrate", 500)
+ self.args["width"] = params_first("width", 400)
self.args["height"] = params_first("height", 240)
# _setup_params()
@@ -77,20 +75,17 @@
def _setup_video(self):
- video = " -of %s" % self.args["mux"]
- video += " -ofps %s" % self.args["fps"]
+ #video = " -of %s" % self.args["mux"]
+ video = " -ofps %s" % self.args["fps"]
vcodec = self.args["vcodec"]
if vcodec == "nuv" or vcodec == "xvid"\
or vcodec == "qtvideo" or vcodec == "copy":
video += " -ovc %s" % vcodec
else:
- video += " -ovc lavc -lavcopts vcodec=%s:vbitrate=%s" % (
+ video += " -ovc lavc -lavcopts vcodec=%s:vhq:vbitrate=%s" % (
vcodec, self.args["vbitrate"])
- if self.args["mux"] == "mpeg":
- video += " -mpegopts format=%s" % self.args["format"]
-
video += " -vf scale=%s:%s" % (self.args["width"], self.args["height"])
return video
# _setup_video()
@@ -274,6 +269,7 @@
def _run_mencoder(self, input=None, output=None):
try:
+ print self.mencoder_opts
self.proc = subprocess.Popen(self.mencoder_opts, stdin=input,
stdout=output, close_fds=True)
except Exception, e:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-11-19 18:06:07
|
Revision: 888
http://gmyth.svn.sourceforge.net/gmyth/?rev=888&view=rev
Author: renatofilho
Date: 2007-11-19 10:06:11 -0800 (Mon, 19 Nov 2007)
Log Message:
-----------
new package version
Modified Paths:
--------------
trunk/gmyth-dbus/debian/changelog
Modified: trunk/gmyth-dbus/debian/changelog
===================================================================
--- trunk/gmyth-dbus/debian/changelog 2007-11-19 17:57:40 UTC (rev 887)
+++ trunk/gmyth-dbus/debian/changelog 2007-11-19 18:06:11 UTC (rev 888)
@@ -1,3 +1,9 @@
+gmyth-dbus (0.1.2) unstable; urgency=low
+
+ * Release 11/19/2007;
+
+ -- Hallyson Melo <hal...@in...> Fri, 11 Nov 2007 15:00:00 -0300
+
gmyth-dbus (0.1.1) unstable; urgency=low
* Implemented error propagation;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-11-19 17:57:42
|
Revision: 887
http://gmyth.svn.sourceforge.net/gmyth/?rev=887&view=rev
Author: renatofilho
Date: 2007-11-19 09:57:40 -0800 (Mon, 19 Nov 2007)
Log Message:
-----------
fixed disconnect signal
Modified Paths:
--------------
trunk/gmyth-dbus/src/gmyth-dbus-server.c
trunk/gmyth-dbus/src/main.c
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-11-15 20:33:59 UTC (rev 886)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-11-19 17:57:40 UTC (rev 887)
@@ -37,7 +37,7 @@
enum
{
- DISCONNECTED,
+ SHUTDOWN,
LAST_SIGNAL
};
@@ -65,15 +65,19 @@
gboolean connected;
GMythEPG *myth_epg;
GMythScheduler *myth_scheduler;
+
+ guint shutdown_cb_id;
};
#define GMYTH_DBUS_SERVER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GMYTH_DBUS_SERVER_TYPE, GMythDbusServerPrivate))
-static void gmyth_dbus_server_class_init (GMythDbusServerClass *klass);
-static void gmyth_dbus_server_init (GMythDbusServer *self);
-static void gmyth_dbus_server_dispose (GObject *object);
-static void gmyth_dbus_server_finalize (GObject *object);
+static void gmyth_dbus_server_class_init (GMythDbusServerClass *klass);
+static void gmyth_dbus_server_init (GMythDbusServer *self);
+static void gmyth_dbus_server_dispose (GObject *object);
+static void gmyth_dbus_server_finalize (GObject *object);
+static void gmyth_dbus_server_cancel_shutdown (GMythDbusServer *self);
+static gboolean gmyth_dbus_server_shutdown_cb (GMythDbusServer *self);
/* Dbus */
static gboolean gmyth_dbus_server_connect (GObject *obj,
@@ -173,8 +177,8 @@
object_class->dispose = gmyth_dbus_server_dispose;
object_class->finalize = gmyth_dbus_server_finalize;
- signals[DISCONNECTED] =
- g_signal_new ("disconnected",
+ signals[SHUTDOWN] =
+ g_signal_new ("shutdown",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0,
@@ -298,6 +302,8 @@
gmyth_dbus_server_internal_disconnect (obj, NULL);
}
+ gmyth_dbus_server_cancel_shutdown (GMYTH_DBUS_SERVER (obj));
+
priv->myth_backend = gmyth_backend_info_new_full (host,
user,
password,
@@ -353,7 +359,8 @@
if (priv->connected)
{
gmyth_dbus_server_internal_disconnect (obj, error);
- g_signal_emit (obj, signals[DISCONNECTED], 0);
+ priv->shutdown_cb_id = g_timeout_add (60000,
+ (GSourceFunc) gmyth_dbus_server_shutdown_cb, obj);
}
return TRUE;
@@ -1238,3 +1245,30 @@
return NULL;
}
+
+static void
+gmyth_dbus_server_cancel_shutdown (GMythDbusServer *self)
+{
+ GMythDbusServerPrivate *priv;
+
+ priv = GMYTH_DBUS_SERVER_GET_PRIVATE (self);
+
+ if (priv->shutdown_cb_id)
+ {
+ g_source_remove (priv->shutdown_cb_id);
+ priv->shutdown_cb_id = 0;
+ }
+}
+
+static gboolean
+gmyth_dbus_server_shutdown_cb (GMythDbusServer *self)
+{
+ GMythDbusServerPrivate *priv;
+
+ priv = GMYTH_DBUS_SERVER_GET_PRIVATE (self);
+
+ priv->shutdown_cb_id = 0;
+ g_signal_emit (self, signals[SHUTDOWN], 0);
+ return FALSE;
+}
+
Modified: trunk/gmyth-dbus/src/main.c
===================================================================
--- trunk/gmyth-dbus/src/main.c 2007-11-15 20:33:59 UTC (rev 886)
+++ trunk/gmyth-dbus/src/main.c 2007-11-19 17:57:40 UTC (rev 887)
@@ -23,7 +23,7 @@
if (srv)
{
g_signal_connect (G_OBJECT (srv),
- "disconnected",
+ "shutdown",
G_CALLBACK (_disconnected_cb),
loop);
g_main_loop_run (loop);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-11-15 20:33:55
|
Revision: 886
http://gmyth.svn.sourceforge.net/gmyth/?rev=886&view=rev
Author: renatofilho
Date: 2007-11-15 12:33:59 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
fixed audio sync
Modified Paths:
--------------
trunk/gst-gmyth/nuvdemux/gstnuvdemux.c
Modified: trunk/gst-gmyth/nuvdemux/gstnuvdemux.c
===================================================================
--- trunk/gst-gmyth/nuvdemux/gstnuvdemux.c 2007-10-30 14:08:04 UTC (rev 885)
+++ trunk/gst-gmyth/nuvdemux/gstnuvdemux.c 2007-11-15 20:33:59 UTC (rev 886)
@@ -882,13 +882,12 @@
goto done;
}
- if ((h.i_timecode < 0)) {
- h.i_timecode = 0;
- // goto done;
+ if ((h.i_timecode > 0) && (h.i_type == 'V')) {
+ g_debug ("TS: %ld", h.i_timecode);
+ timestamp = h.i_timecode * GST_MSECOND;
+ GST_BUFFER_TIMESTAMP(buf) = timestamp;
}
- timestamp = h.i_timecode * GST_MSECOND;
- GST_BUFFER_TIMESTAMP(buf) = timestamp;
} else {
goto done;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-10-30 14:08:04
|
Revision: 885
http://gmyth.svn.sourceforge.net/gmyth/?rev=885&view=rev
Author: renatofilho
Date: 2007-10-30 07:08:04 -0700 (Tue, 30 Oct 2007)
Log Message:
-----------
fixed bug on connect function
Modified Paths:
--------------
trunk/gmyth-dbus/src/gmyth-dbus-server.c
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-29 20:13:33 UTC (rev 884)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-30 14:08:04 UTC (rev 885)
@@ -81,7 +81,6 @@
guint port,
const gchar *user,
const gchar *password,
- gboolean *result,
GError **error);
static gboolean gmyth_dbus_server_get_channel_list (GObject *obj,
GPtrArray **channels,
@@ -234,6 +233,7 @@
_("Fail to connect with EPG"));
return FALSE;
+
}
}
@@ -284,7 +284,6 @@
guint port,
const gchar *user,
const gchar *password,
- gboolean *result,
GError **error)
{
GMythSocket *s;
@@ -296,7 +295,7 @@
if (priv->connected)
{
- gmyth_dbus_server_internal_disconnect (obj, error);
+ gmyth_dbus_server_internal_disconnect (obj, NULL);
}
priv->myth_backend = gmyth_backend_info_new_full (host,
@@ -308,14 +307,14 @@
s = gmyth_backend_info_get_connected_socket (priv->myth_backend);
if (s)
{
+ priv->connected = TRUE;
g_object_unref (s);
- *result = TRUE;
}
else
{
+ priv->connected = FALSE;
g_object_unref (priv->myth_backend);
priv->myth_backend = NULL;
- *result = FALSE;
g_set_error (error,
GMYTH_DBUS_ERROR,
@@ -323,8 +322,7 @@
_("Fail to connect with backend"));
}
- priv->connected = *result;
- return *result;
+ return priv->connected;
}
static gboolean
@@ -349,9 +347,14 @@
gmyth_dbus_server_disconnect (GObject *obj,
GError **error)
{
+ GMythDbusServerPrivate *priv;
- gmyth_dbus_server_internal_disconnect (obj, error);
- g_signal_emit (obj, signals[DISCONNECTED], 0);
+ priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
+ if (priv->connected)
+ {
+ gmyth_dbus_server_internal_disconnect (obj, error);
+ g_signal_emit (obj, signals[DISCONNECTED], 0);
+ }
return TRUE;
}
@@ -384,6 +387,8 @@
g_object_unref (priv->myth_scheduler);
priv->myth_scheduler = NULL;
}
+
+ priv->connected = FALSE;
}
static gboolean
@@ -433,7 +438,7 @@
GMYTH_DBUS_ERROR,
GMYTH_DBUS_ERROR_MYTHTV,
_("Fail to get MythTv details"));
- }
+}
g_object_unref (socket);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-10-29 20:13:29
|
Revision: 884
http://gmyth.svn.sourceforge.net/gmyth/?rev=884&view=rev
Author: renatofilho
Date: 2007-10-29 13:13:33 -0700 (Mon, 29 Oct 2007)
Log Message:
-----------
close service after disconnect called
Modified Paths:
--------------
trunk/gmyth-dbus/src/gmyth-dbus-server.c
trunk/gmyth-dbus/src/main.c
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-29 19:56:35 UTC (rev 883)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-29 20:13:33 UTC (rev 884)
@@ -37,6 +37,12 @@
enum
{
+ DISCONNECTED,
+ LAST_SIGNAL
+};
+
+enum
+{
GMYTH_DBUS_ERROR_MYTHTV,
GMYTH_DBUS_ERROR_CONNECTION,
GMYTH_DBUS_ERROR_EPG,
@@ -109,6 +115,9 @@
GError **error);
static gboolean gmyth_dbus_server_disconnect (GObject *obj,
GError **error);
+static void gmyth_dbus_server_internal_disconnect
+ (GObject *obj,
+ GError **error);
static gboolean gmyth_dbus_server_get_server_info (GObject *obj,
guint64 *total_space,
guint64 *used_space,
@@ -151,6 +160,8 @@
#include "gmyth-dbus-server-glue.h"
+static guint signals[LAST_SIGNAL] = { 0 };
+
G_DEFINE_TYPE (GMythDbusServer, gmyth_dbus_server, G_TYPE_OBJECT);
static void
@@ -163,6 +174,15 @@
object_class->dispose = gmyth_dbus_server_dispose;
object_class->finalize = gmyth_dbus_server_finalize;
+ signals[DISCONNECTED] =
+ g_signal_new ("disconnected",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ 0,
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0, G_TYPE_NONE);
+
dbus_g_object_type_install_info (GMYTH_DBUS_SERVER_TYPE,
&dbus_glib_gmyth_dbus_server_object_info);
}
@@ -276,7 +296,7 @@
if (priv->connected)
{
- gmyth_dbus_server_disconnect (obj, NULL);
+ gmyth_dbus_server_internal_disconnect (obj, error);
}
priv->myth_backend = gmyth_backend_info_new_full (host,
@@ -329,6 +349,17 @@
gmyth_dbus_server_disconnect (GObject *obj,
GError **error)
{
+
+ gmyth_dbus_server_internal_disconnect (obj, error);
+ g_signal_emit (obj, signals[DISCONNECTED], 0);
+
+ return TRUE;
+}
+
+static void
+gmyth_dbus_server_internal_disconnect (GObject *obj,
+ GError **error)
+{
GMythDbusServerPrivate *priv;
g_debug ("%s:%d", __FUNCTION__, __LINE__);
@@ -353,9 +384,6 @@
g_object_unref (priv->myth_scheduler);
priv->myth_scheduler = NULL;
}
-
-
- return TRUE;
}
static gboolean
Modified: trunk/gmyth-dbus/src/main.c
===================================================================
--- trunk/gmyth-dbus/src/main.c 2007-10-29 19:56:35 UTC (rev 883)
+++ trunk/gmyth-dbus/src/main.c 2007-10-29 20:13:33 UTC (rev 884)
@@ -1,5 +1,13 @@
#include "gmyth-dbus-server.h"
+
+static void
+_disconnected_cb (GMythDbusServer *srv,
+ GMainLoop *loop)
+{
+ g_main_loop_quit (loop);
+}
+
int main (int argc, char* argv[])
{
GMainLoop *loop;
@@ -13,7 +21,15 @@
srv = gmyth_dbus_server_start_dbus_service ();
if (srv)
+ {
+ g_signal_connect (G_OBJECT (srv),
+ "disconnected",
+ G_CALLBACK (_disconnected_cb),
+ loop);
g_main_loop_run (loop);
+ g_object_unref (srv);
+ }
+
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-10-29 19:56:36
|
Revision: 883
http://gmyth.svn.sourceforge.net/gmyth/?rev=883&view=rev
Author: renatofilho
Date: 2007-10-29 12:56:35 -0700 (Mon, 29 Oct 2007)
Log Message:
-----------
implemented error propagation
Modified Paths:
--------------
trunk/gmyth-dbus/debian/changelog
trunk/gmyth-dbus/src/gmyth-dbus-server.c
Modified: trunk/gmyth-dbus/debian/changelog
===================================================================
--- trunk/gmyth-dbus/debian/changelog 2007-10-26 22:03:22 UTC (rev 882)
+++ trunk/gmyth-dbus/debian/changelog 2007-10-29 19:56:35 UTC (rev 883)
@@ -1,3 +1,9 @@
+gmyth-dbus (0.1.1) unstable; urgency=low
+
+ * Implemented error propagation;
+
+ -- Hallyson Melo <hal...@in...> Fri, 29 Oct 2006 14:00:16 -0300
+
gmyth-dbus (0.1) unstable; urgency=low
* Initial Package.
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-26 22:03:22 UTC (rev 882)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-29 19:56:35 UTC (rev 883)
@@ -26,15 +26,31 @@
#endif
+#include <glib/gi18n.h>
#include <gmyth/gmyth.h>
#include <dbus/dbus-glib-bindings.h>
-
#include "gmyth-dbus-common.h"
#include "gmyth-dbus-server.h"
#define MYTH_DEFAULT_DB "mythconverg"
+enum
+{
+ GMYTH_DBUS_ERROR_MYTHTV,
+ GMYTH_DBUS_ERROR_CONNECTION,
+ GMYTH_DBUS_ERROR_EPG,
+ GMYTH_DBUS_ERROR_SCHEDULE
+};
+
+#define GMYTH_DBUS_ERROR gmyth_dbus_error_quark ()
+
+GQuark
+gmyth_dbus_error_quark (void)
+{
+ return g_quark_from_static_string ("gmyth-dbus-error-quark");
+}
+
typedef struct _GMythDbusServerPrivate GMythDbusServerPrivate;
struct _GMythDbusServerPrivate
@@ -83,10 +99,11 @@
gint channel_id,
const gchar *start_time,
const gchar *end_time,
- GPtrArray **program_list);
+ GPtrArray **program_list,
+ GError **error);
static gboolean gmyth_dbus_server_get_schedule_list (GObject *obj,
- GPtrArray **schedule_list);
-
+ GPtrArray **schedule_list,
+ GError **error);
static gboolean gmyth_dbus_server_connected (GObject *obj,
gboolean *status,
GError **error);
@@ -168,13 +185,20 @@
}
static gboolean
-gmyth_dbus_server_connect_epg (GMythDbusServer *server)
+gmyth_dbus_server_connect_epg (GMythDbusServer *server, GError **error)
{
GMythDbusServerPrivate *priv;
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (server);
if (!priv->connected)
+ {
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_CONNECTION,
+ _("Not connected"));
+
return FALSE;
+ }
if (!priv->myth_epg)
{
@@ -183,6 +207,12 @@
{
g_object_unref (priv->myth_epg);
priv->myth_epg = NULL;
+
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_EPG,
+ _("Fail to connect with EPG"));
+
return FALSE;
}
}
@@ -191,13 +221,21 @@
}
static gboolean
-gmyth_dbus_server_connect_scheduler (GMythDbusServer *server)
+gmyth_dbus_server_connect_scheduler (GMythDbusServer *server,
+ GError **error)
{
GMythDbusServerPrivate *priv;
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (server);
if (!priv->connected)
+ {
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_CONNECTION,
+ _("Not connected"));
+
return FALSE;
+ }
if (!priv->myth_scheduler)
{
@@ -207,6 +245,12 @@
{
g_object_unref (priv->myth_scheduler);
priv->myth_scheduler = NULL;
+
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_SCHEDULE,
+ _("Fail to connect with Schedule"));
+
return FALSE;
}
}
@@ -230,7 +274,7 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
- if (priv->myth_backend)
+ if (priv->connected)
{
gmyth_dbus_server_disconnect (obj, NULL);
}
@@ -249,10 +293,14 @@
}
else
{
- g_debug ("FAIL TO CONNECT");
g_object_unref (priv->myth_backend);
priv->myth_backend = NULL;
*result = FALSE;
+
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_CONNECTION,
+ _("Fail to connect with backend"));
}
priv->connected = *result;
@@ -329,6 +377,16 @@
socket = gmyth_backend_info_get_connected_socket (priv->myth_backend);
+ if (!socket)
+ {
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_MYTHTV,
+ _("MythTv not avaliable"));
+ return FALSE;
+
+ }
+
details = NULL;
gmyth_util_get_backend_details (socket,
&details);
@@ -341,6 +399,13 @@
ret = TRUE;
}
+ else
+ {
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_MYTHTV,
+ _("Fail to get MythTv details"));
+ }
g_object_unref (socket);
@@ -375,8 +440,10 @@
g_return_val_if_fail (priv->myth_backend != NULL, FALSE);
- if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
+ if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj), error))
+ {
return FALSE;
+ }
ch_type = GMYTH_DBUS_CHANNEL_G_TYPE;
@@ -391,6 +458,13 @@
*info = g_value_get_boxed (&v);
return TRUE;
}
+ else
+ {
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_EPG,
+ _("no channel info avaliable"));
+ }
return FALSE;
}
@@ -411,7 +485,7 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend != NULL, FALSE);
- if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
+ if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj), error))
return FALSE;
@@ -460,7 +534,8 @@
gint channel_id,
const gchar *start_time,
const gchar *end_time,
- GPtrArray **programs)
+ GPtrArray **programs,
+ GError **error)
{
GList *list;
GList *walk;
@@ -474,7 +549,7 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend, FALSE);
- if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
+ if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj), error))
return FALSE;
g_time_val_from_iso8601 (start_time, &start_time_val);
@@ -574,7 +649,7 @@
g_return_val_if_fail (priv->myth_backend, FALSE);
- if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj), error))
return FALSE;
record_type = GMYTH_DBUS_RECORD_G_TYPE;
@@ -597,7 +672,15 @@
return TRUE;
}
+ else
+ {
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_EPG,
+ _("no record info avaliable"));
+ }
+
return FALSE;
}
@@ -617,7 +700,7 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend != NULL, FALSE);
- if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj), error))
return FALSE;
@@ -652,7 +735,8 @@
static gboolean
gmyth_dbus_server_get_schedule_list (GObject *obj,
- GPtrArray **schedules)
+ GPtrArray **schedules,
+ GError **error)
{
GList *list;
GList *walk;
@@ -664,7 +748,7 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend, FALSE);
- if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj), error))
return FALSE;
@@ -733,12 +817,25 @@
g_return_val_if_fail (priv->myth_backend, FALSE);
if (!gmyth_util_file_exists (priv->myth_backend, uri))
+ {
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_MYTHTV,
+ _("File not exists"));
+
goto fail;
+ }
file_transfer = gmyth_file_transfer_new (priv->myth_backend);
if (!gmyth_file_transfer_open (file_transfer, uri))
+ {
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_MYTHTV,
+ _("Fail to open file"));
goto fail;
+ }
filesize = gmyth_file_transfer_get_filesize (file_transfer);
if (filesize <= 0)
@@ -747,13 +844,27 @@
*image = g_byte_array_new ();
result = gmyth_file_transfer_read (file_transfer, *image, filesize, FALSE);
if (result == GMYTH_FILE_READ_ERROR)
+ {
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_MYTHTV,
+ _("Fail to read file"));
+
goto fail;
+ }
gmyth_file_transfer_close (file_transfer);
g_object_unref (file_transfer);
if (filesize > (*image)->len)
+ {
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_MYTHTV,
+ _("Empty file"));
+
goto fail;
+ }
return TRUE;
@@ -785,12 +896,23 @@
*icon = NULL;
if (channel == NULL)
+ {
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_MYTHTV,
+ _("Invalid channel"));
+
return FALSE;
+ }
if (!gmyth_epg_channel_has_icon(priv->myth_epg, channel))
{
gmyth_channel_info_free (channel);
- g_debug("Channel does not have icon available");
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_MYTHTV,
+ _("Channel does not have icon available"));
+
return FALSE;
}
@@ -802,7 +924,11 @@
&icon_length))
{
gmyth_channel_info_free (channel);
- g_warning("Could not get channel icon for channel id = %u", channel_id);
+ g_set_error (error,
+ GMYTH_DBUS_ERROR,
+ GMYTH_DBUS_ERROR_MYTHTV,
+ _("Could not get channel icon for channel id = %u"),
+ channel_id);
return FALSE;
}
@@ -828,7 +954,7 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend, FALSE);
- if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj), error))
return FALSE;
ret = gmyth_scheduler_stop_recording (priv->myth_scheduler,
@@ -893,7 +1019,7 @@
g_return_val_if_fail (priv->myth_backend, FALSE);
- if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj), error))
return FALSE;
@@ -980,7 +1106,7 @@
g_return_val_if_fail (priv->myth_backend, FALSE);
- if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj), error))
return FALSE;
g_time_val_from_iso8601 (start_time, &start_vtime);
@@ -1020,7 +1146,7 @@
g_return_val_if_fail (priv->myth_backend, FALSE);
- if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj), error))
return FALSE;
return gmyth_scheduler_delete_schedule (priv->myth_scheduler, schedule_id);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-10-26 22:03:18
|
Revision: 882
http://gmyth.svn.sourceforge.net/gmyth/?rev=882&view=rev
Author: renatofilho
Date: 2007-10-26 15:03:22 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
force connecte always connect called
Modified Paths:
--------------
trunk/gmyth-dbus/src/gmyth-dbus-server.c
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-26 21:09:47 UTC (rev 881)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-26 22:03:22 UTC (rev 882)
@@ -231,7 +231,9 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
if (priv->myth_backend)
- return TRUE;
+ {
+ gmyth_dbus_server_disconnect (obj, NULL);
+ }
priv->myth_backend = gmyth_backend_info_new_full (host,
user,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <me...@us...> - 2007-10-26 21:09:43
|
Revision: 881
http://gmyth.svn.sourceforge.net/gmyth/?rev=881&view=rev
Author: melunko
Date: 2007-10-26 14:09:47 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
gmyth-dbus debian/control updated to gmyth 0.4.1
Modified Paths:
--------------
trunk/gmyth-dbus/debian/control
Modified: trunk/gmyth-dbus/debian/control
===================================================================
--- trunk/gmyth-dbus/debian/control 2007-10-25 21:08:12 UTC (rev 880)
+++ trunk/gmyth-dbus/debian/control 2007-10-26 21:09:47 UTC (rev 881)
@@ -1,13 +1,13 @@
Source: gmyth-dbus
Priority: optional
Maintainer: Hallyson Melo <hal...@in...>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), gmyth-dev (>= 0.4), libdbus-glib-1-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), gmyth-dev (>= 0.4.1), libdbus-glib-1-dev
Standards-Version: 3.6.2
Section: user/library
Package: gmyth-dbus
Section: user/library
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gmyth (>= 0.4), libdbus-glib-1-2
+Depends: ${shlibs:Depends}, ${misc:Depends}, gmyth (>= 0.4.1), libdbus-glib-1-2
Description: The gmyth dbus interface.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-10-25 21:08:18
|
Revision: 880
http://gmyth.svn.sourceforge.net/gmyth/?rev=880&view=rev
Author: renatofilho
Date: 2007-10-25 14:08:12 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
fixed connection bug
Modified Paths:
--------------
trunk/gmyth-dbus/src/gmyth-dbus-server.c
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-25 19:36:19 UTC (rev 879)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-25 21:08:12 UTC (rev 880)
@@ -40,6 +40,7 @@
struct _GMythDbusServerPrivate
{
GMythBackendInfo *myth_backend;
+ gboolean connected;
GMythEPG *myth_epg;
GMythScheduler *myth_scheduler;
};
@@ -172,6 +173,9 @@
GMythDbusServerPrivate *priv;
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (server);
+ if (!priv->connected)
+ return FALSE;
+
if (!priv->myth_epg)
{
priv->myth_epg = gmyth_epg_new();
@@ -192,6 +196,9 @@
GMythDbusServerPrivate *priv;
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (server);
+ if (!priv->connected)
+ return FALSE;
+
if (!priv->myth_scheduler)
{
priv->myth_scheduler = gmyth_scheduler_new ();
@@ -216,6 +223,7 @@
gboolean *result,
GError **error)
{
+ GMythSocket *s;
GMythDbusServerPrivate *priv;
g_debug ("%s:%d", __FUNCTION__, __LINE__);
@@ -230,8 +238,23 @@
password,
MYTH_DEFAULT_DB,
port);
- *result = TRUE;
- return TRUE;
+
+ s = gmyth_backend_info_get_connected_socket (priv->myth_backend);
+ if (s)
+ {
+ g_object_unref (s);
+ *result = TRUE;
+ }
+ else
+ {
+ g_debug ("FAIL TO CONNECT");
+ g_object_unref (priv->myth_backend);
+ priv->myth_backend = NULL;
+ *result = FALSE;
+ }
+
+ priv->connected = *result;
+ return *result;
}
static gboolean
@@ -591,7 +614,7 @@
g_debug ("%s:%d", __FUNCTION__, __LINE__);
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
- g_return_val_if_fail (priv->myth_backend, FALSE);
+ g_return_val_if_fail (priv->myth_backend != NULL, FALSE);
if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
return FALSE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2007-10-25 19:36:16
|
Revision: 879
http://gmyth.svn.sourceforge.net/gmyth/?rev=879&view=rev
Author: renatofilho
Date: 2007-10-25 12:36:19 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
bug fixes
Modified Paths:
--------------
trunk/gmyth-dbus/src/gmyth-dbus-server.c
Modified: trunk/gmyth-dbus/src/gmyth-dbus-server.c
===================================================================
--- trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-25 17:43:23 UTC (rev 878)
+++ trunk/gmyth-dbus/src/gmyth-dbus-server.c 2007-10-25 19:36:19 UTC (rev 879)
@@ -217,6 +217,9 @@
GError **error)
{
GMythDbusServerPrivate *priv;
+
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
+
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
if (priv->myth_backend)
@@ -237,6 +240,9 @@
GError **error)
{
GMythDbusServerPrivate *priv;
+
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
+
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
if (priv->myth_backend)
@@ -251,6 +257,9 @@
GError **error)
{
GMythDbusServerPrivate *priv;
+
+ g_debug ("%s:%d", __FUNCTION__, __LINE__);
+
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
if (priv->myth_epg)
@@ -340,8 +349,10 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend != NULL, FALSE);
- g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE);
+ if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
+ return FALSE;
+
ch_type = GMYTH_DBUS_CHANNEL_G_TYPE;
ch_info = gmyth_epg_get_channel_info (priv->myth_epg, channel_id);
@@ -375,9 +386,11 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend != NULL, FALSE);
- g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE);
+ if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
+ return FALSE;
+ lst = NULL;
len = gmyth_epg_get_channel_list (priv->myth_epg, &lst);
*channels = g_ptr_array_sized_new (len);
@@ -436,7 +449,8 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend, FALSE);
- g_return_val_if_fail (gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)), FALSE);
+ if (!gmyth_dbus_server_connect_epg (GMYTH_DBUS_SERVER (obj)))
+ return FALSE;
g_time_val_from_iso8601 (start_time, &start_time_val);
g_time_val_from_iso8601 (end_time, &end_time_val);
@@ -534,8 +548,10 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend, FALSE);
- g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ return FALSE;
+
record_type = GMYTH_DBUS_RECORD_G_TYPE;
record_info = gmyth_scheduler_get_recorded_info (priv->myth_scheduler,
@@ -576,7 +592,8 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend, FALSE);
- g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ return FALSE;
len = gmyth_scheduler_get_recorded_list (priv->myth_scheduler,
@@ -622,7 +639,8 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend, FALSE);
- g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ return FALSE;
len = gmyth_scheduler_get_schedule_list (priv->myth_scheduler,
@@ -685,6 +703,8 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
+ file_transfer = NULL;
+
g_return_val_if_fail (priv->myth_backend, FALSE);
if (!gmyth_util_file_exists (priv->myth_backend, uri))
@@ -783,7 +803,8 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend, FALSE);
- g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ return FALSE;
ret = gmyth_scheduler_stop_recording (priv->myth_scheduler,
channel_id);
@@ -846,9 +867,11 @@
*schedule_id = 0;
g_return_val_if_fail (priv->myth_backend, FALSE);
- g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ return FALSE;
+
g_time_val_from_iso8601 (start_time, &start_vtime);
g_time_val_from_iso8601 (end_time, &end_vtime);
sch_info = gmyth_dbus_server_new_schedule_info (description,
@@ -931,8 +954,10 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend, FALSE);
- g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ return FALSE;
+
g_time_val_from_iso8601 (start_time, &start_vtime);
g_time_val_from_iso8601 (end_time, &end_vtime);
@@ -969,8 +994,10 @@
priv = GMYTH_DBUS_SERVER_GET_PRIVATE (obj);
g_return_val_if_fail (priv->myth_backend, FALSE);
- g_return_val_if_fail (gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)), FALSE);
+ if (!gmyth_dbus_server_connect_scheduler (GMYTH_DBUS_SERVER (obj)))
+ return FALSE;
+
return gmyth_scheduler_delete_schedule (priv->myth_scheduler, schedule_id);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <me...@us...> - 2007-10-25 17:43:18
|
Revision: 878
http://gmyth.svn.sourceforge.net/gmyth/?rev=878&view=rev
Author: melunko
Date: 2007-10-25 10:43:23 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
Added gmyth-dbus/debian files for package generation
Added Paths:
-----------
trunk/gmyth-dbus/debian/
trunk/gmyth-dbus/debian/changelog
trunk/gmyth-dbus/debian/compat
trunk/gmyth-dbus/debian/control
trunk/gmyth-dbus/debian/rules
Added: trunk/gmyth-dbus/debian/changelog
===================================================================
--- trunk/gmyth-dbus/debian/changelog (rev 0)
+++ trunk/gmyth-dbus/debian/changelog 2007-10-25 17:43:23 UTC (rev 878)
@@ -0,0 +1,6 @@
+gmyth-dbus (0.1) unstable; urgency=low
+
+ * Initial Package.
+
+ -- Hallyson Melo <hal...@in...> Fri, 25 Oct 2006 14:00:16 -0300
+
Added: trunk/gmyth-dbus/debian/compat
===================================================================
--- trunk/gmyth-dbus/debian/compat (rev 0)
+++ trunk/gmyth-dbus/debian/compat 2007-10-25 17:43:23 UTC (rev 878)
@@ -0,0 +1 @@
+4
Added: trunk/gmyth-dbus/debian/control
===================================================================
--- trunk/gmyth-dbus/debian/control (rev 0)
+++ trunk/gmyth-dbus/debian/control 2007-10-25 17:43:23 UTC (rev 878)
@@ -0,0 +1,13 @@
+Source: gmyth-dbus
+Priority: optional
+Maintainer: Hallyson Melo <hal...@in...>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), gmyth-dev (>= 0.4), libdbus-glib-1-dev
+Standards-Version: 3.6.2
+Section: user/library
+
+Package: gmyth-dbus
+Section: user/library
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gmyth (>= 0.4), libdbus-glib-1-2
+Description: The gmyth dbus interface.
+
Added: trunk/gmyth-dbus/debian/rules
===================================================================
--- trunk/gmyth-dbus/debian/rules (rev 0)
+++ trunk/gmyth-dbus/debian/rules 2007-10-25 17:43:23 UTC (rev 878)
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+# debian package version
+version=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
+
+maint: debian/control
+
+common_conf_flags = \
+ --disable-debug
+
+# FIXME: should disable docs for arch only builds
+DEB_CONFIGURE_EXTRA_FLAGS := $(common_conf_flags)
+
+
+.PHONY: maint
Property changes on: trunk/gmyth-dbus/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <me...@us...> - 2007-10-25 17:40:10
|
Revision: 877
http://gmyth.svn.sourceforge.net/gmyth/?rev=877&view=rev
Author: melunko
Date: 2007-10-25 10:40:14 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
gmyth-dbus configure.ac: package renamed from myth-dbus to gmyth-dbus
Modified Paths:
--------------
trunk/gmyth-dbus/configure.ac
Modified: trunk/gmyth-dbus/configure.ac
===================================================================
--- trunk/gmyth-dbus/configure.ac 2007-10-25 14:40:47 UTC (rev 876)
+++ trunk/gmyth-dbus/configure.ac 2007-10-25 17:40:14 UTC (rev 877)
@@ -3,7 +3,7 @@
AC_PREREQ(2.50)
-AC_INIT([myth-dbus],[0.1])
+AC_INIT([gmyth-dbus],[0.1])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER(config.h)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
