From: <me...@us...> - 2007-08-22 13:55:40
|
Revision: 826 http://gmyth.svn.sourceforge.net/gmyth/?rev=826&view=rev Author: melunko Date: 2007-08-22 06:55:41 -0700 (Wed, 22 Aug 2007) Log Message: ----------- gmyth-ls and gmyth_query now considers db_port. Thanks to Bastien Nocera for his patch. Modified Paths: -------------- trunk/gmyth/samples/gmyth_ls.c trunk/gmyth/src/gmyth_query.c Modified: trunk/gmyth/samples/gmyth_ls.c =================================================================== --- trunk/gmyth/samples/gmyth_ls.c 2007-08-22 13:07:49 UTC (rev 825) +++ trunk/gmyth/samples/gmyth_ls.c 2007-08-22 13:55:41 UTC (rev 826) @@ -42,6 +42,7 @@ gchar *host_ip = NULL; gint host_port = 0; + gint db_port = 0; gboolean list_channels = FALSE; gchar *username = NULL; gchar *password = NULL; @@ -59,13 +60,17 @@ "LIST_CHANNELS"}, {"username", 'u', 0, G_OPTION_ARG_STRING, &username, - "Mysql database username. Default: mythtv" "Mysql user", + "Mysql database username. Default: mythtv", "MYSQL_USER"}, {"password", 'w', 0, G_OPTION_ARG_STRING, &password, - "Mysql database password. Default: mythtv" "Mysql password", + "Mysql database password. Default: mythtv", "MYSQL_PASSWD"}, + {"db_port", 'P', 0, G_OPTION_ARG_STRING, &db_port, + "Mysql database port. Default: 0", + "MYSQL_PORT"}, + {NULL} }; Modified: trunk/gmyth/src/gmyth_query.c =================================================================== --- trunk/gmyth/src/gmyth_query.c 2007-08-22 13:07:49 UTC (rev 825) +++ trunk/gmyth/src/gmyth_query.c 2007-08-22 13:55:41 UTC (rev 826) @@ -161,7 +161,9 @@ gmyth_query->backend_info->hostname, gmyth_query->backend_info->username, gmyth_query->backend_info->password, - gmyth_query->backend_info->db_name, 0, NULL, + gmyth_query->backend_info->db_name, + gmyth_query->backend_info->db_port, + NULL, 0) == NULL) { gmyth_query_print_error(gmyth_query->conn, "mysql_real_connect() failed"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <me...@us...> - 2007-08-22 13:57:49
|
Revision: 827 http://gmyth.svn.sourceforge.net/gmyth/?rev=827&view=rev Author: melunko Date: 2007-08-22 06:57:53 -0700 (Wed, 22 Aug 2007) Log Message: ----------- GMyth 0.4 release Modified Paths: -------------- trunk/gmyth/configure.ac trunk/gmyth/debian/changelog Modified: trunk/gmyth/configure.ac =================================================================== --- trunk/gmyth/configure.ac 2007-08-22 13:55:41 UTC (rev 826) +++ trunk/gmyth/configure.ac 2007-08-22 13:57:53 UTC (rev 827) @@ -3,14 +3,14 @@ AC_PREREQ(2.50) -AC_INIT([gmyth],[0.3]) +AC_INIT([gmyth],[0.4]) AC_CONFIG_SRCDIR([src/gmyth.h]) AC_CONFIG_HEADER(config.h) dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, SVN and prerelease does Werror too -AS_VERSION(gmyth, GMYTH, 0, 3, 0, 0, GMYTH_SVN="no", GMYTH_SVN="yes") +AS_VERSION(gmyth, GMYTH, 0, 4, 0, 0, GMYTH_SVN="no", GMYTH_SVN="yes") GMYTH_MAJORMINOR=$GMYTH_MAJOR_VERSION.$GMYTH_MINOR_VERSION AC_SUBST(GMYTH_MAJORMINOR) Modified: trunk/gmyth/debian/changelog =================================================================== --- trunk/gmyth/debian/changelog 2007-08-22 13:55:41 UTC (rev 826) +++ trunk/gmyth/debian/changelog 2007-08-22 13:57:53 UTC (rev 827) @@ -1,3 +1,11 @@ +gmyth (0.4) 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; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mo...@us...> - 2007-08-28 07:16:15
|
Revision: 833 http://gmyth.svn.sourceforge.net/gmyth/?rev=833&view=rev Author: morphbr Date: 2007-08-28 00:16:13 -0700 (Tue, 28 Aug 2007) Log Message: ----------- - Restored working version of gmyth_monitor_handler.c - Patch on gmyth-cat by Renato Filho Modified Paths: -------------- trunk/gmyth/samples/gmyth_cat.c trunk/gmyth/src/gmyth_monitor_handler.c trunk/gmyth/src/gmyth_monitor_handler.h Modified: trunk/gmyth/samples/gmyth_cat.c =================================================================== --- trunk/gmyth/samples/gmyth_cat.c 2007-08-23 21:45:15 UTC (rev 832) +++ trunk/gmyth/samples/gmyth_cat.c 2007-08-28 07:16:13 UTC (rev 833) @@ -200,7 +200,7 @@ (GByteArray *) array, 64000, TRUE)) == GMYTH_FILE_READ_OK) || file_transf_ret == GMYTH_FILE_READ_NEXT_PROG_CHAIN) { - fwrite(array->data, array->len, 1, stdout); + fwrite(array->data, sizeof(gpointer), array->len, stdout); fflush(stdout); g_array_remove_range(array, 0, array->len); Modified: trunk/gmyth/src/gmyth_monitor_handler.c =================================================================== --- trunk/gmyth/src/gmyth_monitor_handler.c 2007-08-23 21:45:15 UTC (rev 832) +++ trunk/gmyth/src/gmyth_monitor_handler.c 2007-08-28 07:16:13 UTC (rev 833) @@ -70,9 +70,7 @@ #define GMYTHTV_ENABLE_DEBUG 1 #endif -gboolean gmyth_monitor_handler_listener (GIOChannel *io_channel, - GIOCondition condition, - gpointer data); +gpointer gmyth_monitor_handler_listener(gpointer data); static void gmyth_monitor_handler_default_listener(GMythMonitorHandler * monitor, @@ -94,10 +92,51 @@ void gmyth_monitor_handler_close(GMythMonitorHandler * monitor); -G_DEFINE_TYPE(GMythMonitorHandler, gmyth_monitor_handler, G_TYPE_OBJECT); +G_DEFINE_TYPE(GMythMonitorHandler, gmyth_monitor_handler, G_TYPE_OBJECT) + static void -static void -gmyth_monitor_handler_class_init(GMythMonitorHandlerClass * klass) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + gmyth_monitor_handler_class_init(GMythMonitorHandlerClass * klass) { GObjectClass *gobject_class; GMythMonitorHandlerClass *gmonitor_class; @@ -130,11 +169,23 @@ monitor->hostname = NULL; monitor->port = 0; monitor->actual_index = 0; + monitor->allow_msgs_listener = FALSE; + /* + * monitor->backend_msgs = g_hash_table_new( g_int_hash, g_int_equal + * ); + */ + + /* * it is used for signalizing the event socket consumer thread */ monitor->mutex = g_mutex_new(); + + monitor->th = NULL; + + monitor->gmyth_monitor_handler_listener = + gmyth_monitor_handler_listener; } static void @@ -146,9 +197,14 @@ monitor->allow_msgs_listener = FALSE; - if (monitor->io_source != 0) { - g_source_remove (monitor->io_source); - monitor->io_source = 0; + if (monitor->th != NULL) { + gboolean *ret = (gboolean *) g_thread_join(monitor->th); + + if (*ret == FALSE) + gmyth_debug("Error closing GThread listener socket!"); + else + gmyth_debug("Closed GThread listener socket."); + // g_object_unref( monitor->th ); } /* @@ -170,7 +226,6 @@ monitor->hostname = NULL; } - if (monitor->backend_msgs != NULL) { g_hash_table_destroy(monitor->backend_msgs); monitor->backend_msgs = NULL; @@ -181,7 +236,6 @@ * io_watcher_cond = NULL; } */ - G_OBJECT_CLASS(gmyth_monitor_handler_parent_class)->dispose(object); } @@ -299,22 +353,30 @@ gmyth_debug("Monitor event socket --- hostname: %s, port %d\n", monitor->hostname, monitor->port); - if (monitor->event_sock != NULL) { + if (NULL != monitor->event_sock) { g_object_unref(monitor->event_sock); monitor->event_sock = NULL; } /* - * configure the event socket + * configure the event socket */ - if (!gmyth_connect_to_backend_monitor(monitor)) { - gmyth_debug("Connection to backend failed (Event Socket)!"); - ret = FALSE; + if (NULL == monitor->event_sock) { + if (!gmyth_connect_to_backend_monitor(monitor)) { + gmyth_debug("Connection to backend failed (Event Socket)!"); + ret = FALSE; + } else { + gmyth_debug + ("Remote monitor event socket had been succesfully created. (io_fd == %d)\n", + g_io_channel_unix_get_fd(monitor->event_sock->sd_io_ch)); + } } else { - gmyth_debug ("Remote monitor event socket had been succesfully create"); + gmyth_debug + ("ASSERT ERROR: Remote monitor event socket is not NULL at the setup...\n"); } return ret; + } /** @@ -431,73 +493,122 @@ * @return Pointer to a gboolean <code>true</code> value, if the data was * successfully read. */ -gboolean -gmyth_monitor_handler_listener (GIOChannel *io_channel, - GIOCondition io_cond, - gpointer data) +gpointer +gmyth_monitor_handler_listener(gpointer data) { - GMythMonitorHandler *monitor; + GMythMonitorHandler *monitor = (GMythMonitorHandler *) data; guint recv = 0; + gboolean *ret = g_new0(gboolean, 1); gsize len = 0; - GMythStringList *strlist = NULL; - gint bytes_sent = 0; + GIOChannel *io_channel = monitor->event_sock->sd_io_ch; + GIOCondition io_cond = + g_io_channel_get_buffer_condition(io_channel); + static guint count = 0; - monitor = (GMythMonitorHandler *) data; + *ret = TRUE; gmyth_debug("Entering MONITOR handler listener..."); myth_control_acquire_context(monitor, TRUE); - if (((io_cond & G_IO_HUP) != 0) || - ((io_cond & G_IO_ERR) != 0)) { + if ((io_cond & G_IO_HUP) != 0) { + *ret = FALSE; goto clean_up; } + GMythStringList *strlist = NULL; - gmyth_debug("%d - Listening on Monitor socket...!\n", count); - strlist = gmyth_string_list_new(); + if (NULL == io_channel) { + gmyth_debug("Monitor socket is NULL! (GIOChannel)"); + *ret = FALSE; + goto clean_up; + } - len = gmyth_socket_read_stringlist(monitor->event_sock, strlist); - if ((len > 0) && strlist != NULL && gmyth_string_list_length(strlist) > 0) { - gchar *back_msg_action; - gint msg_type; + while (monitor->allow_msgs_listener) { + ++count; - bytes_sent = gmyth_string_list_get_int(strlist, 0); - // on backend error - gmyth_debug ("received data buffer from IO event channel... %d strings gone!\n", len); - recv += len; + gmyth_debug("%d - Listening on Monitor socket...!\n", count); - /* - * debug purpose: prints out all the string list - * elements - */ - g_list_foreach(strlist->glist, - (GFunc) gmyth_monitor_handler_print, - NULL); + do { - back_msg_action = g_new0(gchar, 1); - msg_type = gmyth_monitor_handler_is_backend_message(monitor, - strlist, - &back_msg_action); + gint bytes_sent = 0; - if (msg_type != GMYTH_BACKEND_NO_MESSAGE) { - g_signal_emit(monitor, - GMYTH_MONITOR_HANDLER_GET_CLASS(monitor)->backend_events_handler_signal_id, - 0, msg_type, back_msg_action); + strlist = gmyth_string_list_new(); + + if (monitor->event_sock != NULL) { + + len = + gmyth_socket_read_stringlist(monitor->event_sock, + strlist); + + if ((len > 0) && strlist != NULL + && gmyth_string_list_length(strlist) > 0) { + bytes_sent = gmyth_string_list_get_int(strlist, 0); // -1 + // + // + // on + // backend + // error + + gmyth_debug + ("[%s] MONITOR: received data buffer from IO event channel... %d strings gone!\n", + __FUNCTION__, len); + + recv += len; + + /* + * debug purpose: prints out all the string list + * elements + */ + g_list_foreach(strlist->glist, + (GFunc) gmyth_monitor_handler_print, + NULL); + + gchar *back_msg_action = g_new0(gchar, 1); + gint msg_type = + gmyth_monitor_handler_is_backend_message(monitor, + strlist, + &back_msg_action); + + if (monitor != NULL + && msg_type != GMYTH_BACKEND_NO_MESSAGE) + g_signal_emit(monitor, GMYTH_MONITOR_HANDLER_GET_CLASS(monitor)->backend_events_handler_signal_id, 0, /* details + */ + msg_type, back_msg_action); + + if (back_msg_action != NULL) + g_free(back_msg_action); + + } + + } + + if (strlist != NULL) { + g_object_unref(strlist); + strlist = NULL; + } + + io_cond = g_io_channel_get_buffer_condition(io_channel); + + g_usleep(500); + } + while (recv <= 0 && ((io_cond & G_IO_HUP) == 0)); - if (back_msg_action != NULL) - g_free(back_msg_action); + gmyth_debug("\tMONITOR EVENT: Read %d bytes\n", recv); - g_object_unref(strlist); - } + } /* main GThread while */ -clean_up: + clean_up: myth_control_release_context(monitor); - return TRUE; + + g_thread_exit(ret); + + return (gpointer) ret; + } -/** +/** * Opens connection events' socket the the Monitor socket on * MythTV backend server. * @@ -505,7 +616,7 @@ * * @return <code>true</code>, if the socket was successfully opened. */ -static gboolean +static gboolean gmyth_connect_to_backend_monitor(GMythMonitorHandler * monitor) { gboolean ret = TRUE; @@ -514,7 +625,7 @@ /* * Connects the socket, send Mythtv ANN Monitor and verify Mythtv - * protocol version + * protocol version */ if (!gmyth_socket_connect_to_backend_events(monitor->event_sock, monitor->hostname, @@ -527,38 +638,52 @@ return ret; } -/** +/** * Opens connection the the Monitor socket on MythTV backend server, * where all status messages are notified to the client. - * + * * @param monitor The GMythMonitorHandler instance. * @param channel The GIOChannel instance to the Monitor socket. - * + * * @return Pointer to the boolean value, and it is <code>true</code> only if the - * GMythMonitorHandler could be configured. + * GMythMonitorHandler could be configured. */ -static gboolean +static gboolean gmyth_monitor_handler_setup(GMythMonitorHandler * monitor, GIOChannel * channel) { - gboolean ret = TRUE; + gboolean ret = TRUE; if (channel != NULL) { monitor->allow_msgs_listener = TRUE; - monitor->io_source = g_io_add_watch (channel, G_IO_IN | G_IO_ERR | G_IO_HUP, - gmyth_monitor_handler_listener, - monitor); + + monitor->th = + g_thread_create((GThreadFunc) gmyth_monitor_handler_listener, + monitor, TRUE, NULL); + gmyth_debug("MONITOR GThread created!"); } else { ret = FALSE; + goto cleanup; } + + if (NULL == monitor->th) { + gmyth_debug + ("[%s] Error adding GThread listener function to the IO control channel!\n", + __FUNCTION__); + ret = FALSE; + goto cleanup; + } + + cleanup: + return ret; } -/** +/** * Starts the MonitorHandler thread to the GIOWatcher. - * + * * @param monitor The GMythMonitorHandler instance. - * + * * @return <code>true</code>, if the MonitorHandler was started. */ gboolean Modified: trunk/gmyth/src/gmyth_monitor_handler.h =================================================================== --- trunk/gmyth/src/gmyth_monitor_handler.h 2007-08-23 21:45:15 UTC (rev 832) +++ trunk/gmyth/src/gmyth_monitor_handler.h 2007-08-28 07:16:13 UTC (rev 833) @@ -63,12 +63,12 @@ GObjectClass parent_class; /* - * callbacks + * callbacks */ guint backend_events_handler_signal_id; /* - * signal default handlers + * signal default handlers */ void (*backend_events_handler) (GMythMonitorHandler * monitor, gint msg_code, @@ -88,8 +88,14 @@ */ GMythSocket *event_sock; - //gpointer(*gmyth_monitor_handler_listener) (gpointer data); + + + + + + gpointer(*gmyth_monitor_handler_listener) (gpointer data); + gchar *hostname; gint port; @@ -103,7 +109,9 @@ GHashTable *backend_msgs; GMutex *mutex; - guint io_source; + + GThread *th; + }; GType gmyth_monitor_handler_get_type(void); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mo...@us...> - 2007-08-29 13:29:32
|
Revision: 837 http://gmyth.svn.sourceforge.net/gmyth/?rev=837&view=rev Author: morphbr Date: 2007-08-29 06:29:24 -0700 (Wed, 29 Aug 2007) Log Message: ----------- - Deleted old code - Bug fix on gmencoder by Renato Filho - Restored Renato's version of monitor_handler to work with gmencoder Modified Paths: -------------- trunk/gmyth/src/gmyth_monitor_handler.c trunk/gmyth/src/gmyth_monitor_handler.h trunk/gmyth-stream/gmemcoder/src/gmencoder.c Removed Paths: ------------- trunk/gmyth-stream/libgnomevfs2/ Modified: trunk/gmyth/src/gmyth_monitor_handler.c =================================================================== --- trunk/gmyth/src/gmyth_monitor_handler.c 2007-08-29 09:00:25 UTC (rev 836) +++ trunk/gmyth/src/gmyth_monitor_handler.c 2007-08-29 13:29:24 UTC (rev 837) @@ -70,7 +70,9 @@ #define GMYTHTV_ENABLE_DEBUG 1 #endif -gpointer gmyth_monitor_handler_listener(gpointer data); +static gboolean gmyth_monitor_handler_listener (GIOChannel *io_channel, + GIOCondition condition, + gpointer data); static void gmyth_monitor_handler_default_listener(GMythMonitorHandler * monitor, @@ -92,51 +94,10 @@ void gmyth_monitor_handler_close(GMythMonitorHandler * monitor); -G_DEFINE_TYPE(GMythMonitorHandler, gmyth_monitor_handler, G_TYPE_OBJECT) - static void +G_DEFINE_TYPE(GMythMonitorHandler, gmyth_monitor_handler, G_TYPE_OBJECT); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - gmyth_monitor_handler_class_init(GMythMonitorHandlerClass * klass) +static void +gmyth_monitor_handler_class_init(GMythMonitorHandlerClass * klass) { GObjectClass *gobject_class; GMythMonitorHandlerClass *gmonitor_class; @@ -169,23 +130,11 @@ monitor->hostname = NULL; monitor->port = 0; monitor->actual_index = 0; - monitor->allow_msgs_listener = FALSE; - /* - * monitor->backend_msgs = g_hash_table_new( g_int_hash, g_int_equal - * ); - */ - - /* * it is used for signalizing the event socket consumer thread */ monitor->mutex = g_mutex_new(); - - monitor->th = NULL; - - monitor->gmyth_monitor_handler_listener = - gmyth_monitor_handler_listener; } static void @@ -197,14 +146,9 @@ monitor->allow_msgs_listener = FALSE; - if (monitor->th != NULL) { - gboolean *ret = (gboolean *) g_thread_join(monitor->th); - - if (*ret == FALSE) - gmyth_debug("Error closing GThread listener socket!"); - else - gmyth_debug("Closed GThread listener socket."); - // g_object_unref( monitor->th ); + if (monitor->io_source != 0) { + g_source_remove (monitor->io_source); + monitor->io_source = 0; } /* @@ -226,6 +170,7 @@ monitor->hostname = NULL; } + if (monitor->backend_msgs != NULL) { g_hash_table_destroy(monitor->backend_msgs); monitor->backend_msgs = NULL; @@ -236,6 +181,7 @@ * io_watcher_cond = NULL; } */ + G_OBJECT_CLASS(gmyth_monitor_handler_parent_class)->dispose(object); } @@ -353,30 +299,22 @@ gmyth_debug("Monitor event socket --- hostname: %s, port %d\n", monitor->hostname, monitor->port); - if (NULL != monitor->event_sock) { + if (monitor->event_sock != NULL) { g_object_unref(monitor->event_sock); monitor->event_sock = NULL; } /* - * configure the event socket + * configure the event socket */ - if (NULL == monitor->event_sock) { - if (!gmyth_connect_to_backend_monitor(monitor)) { - gmyth_debug("Connection to backend failed (Event Socket)!"); - ret = FALSE; - } else { - gmyth_debug - ("Remote monitor event socket had been succesfully created. (io_fd == %d)\n", - g_io_channel_unix_get_fd(monitor->event_sock->sd_io_ch)); - } + if (!gmyth_connect_to_backend_monitor(monitor)) { + gmyth_debug("Connection to backend failed (Event Socket)!"); + ret = FALSE; } else { - gmyth_debug - ("ASSERT ERROR: Remote monitor event socket is not NULL at the setup...\n"); + gmyth_debug ("Remote monitor event socket had been succesfully create"); } return ret; - } /** @@ -493,122 +431,73 @@ * @return Pointer to a gboolean <code>true</code> value, if the data was * successfully read. */ -gpointer -gmyth_monitor_handler_listener(gpointer data) +static gboolean +gmyth_monitor_handler_listener (GIOChannel *io_channel, + GIOCondition io_cond, + gpointer data) { - GMythMonitorHandler *monitor = (GMythMonitorHandler *) data; + GMythMonitorHandler *monitor; guint recv = 0; - gboolean *ret = g_new0(gboolean, 1); gsize len = 0; - GIOChannel *io_channel = monitor->event_sock->sd_io_ch; - GIOCondition io_cond = - g_io_channel_get_buffer_condition(io_channel); - static guint count = 0; + GMythStringList *strlist = NULL; + gint bytes_sent = 0; - *ret = TRUE; + monitor = (GMythMonitorHandler *) data; gmyth_debug("Entering MONITOR handler listener..."); myth_control_acquire_context(monitor, TRUE); - if ((io_cond & G_IO_HUP) != 0) { - *ret = FALSE; + if (((io_cond & G_IO_HUP) != 0) || + ((io_cond & G_IO_ERR) != 0)) { goto clean_up; } - GMythStringList *strlist = NULL; - if (NULL == io_channel) { - gmyth_debug("Monitor socket is NULL! (GIOChannel)"); - *ret = FALSE; - goto clean_up; - } + gmyth_debug("Listening on Monitor socket...!\n"); + strlist = gmyth_string_list_new(); - while (monitor->allow_msgs_listener) { - ++count; + len = gmyth_socket_read_stringlist(monitor->event_sock, strlist); + if ((len > 0) && strlist != NULL && gmyth_string_list_length(strlist) > 0) { + gchar *back_msg_action; + gint msg_type; - gmyth_debug("%d - Listening on Monitor socket...!\n", count); + bytes_sent = gmyth_string_list_get_int(strlist, 0); + // on backend error + gmyth_debug ("received data buffer from IO event channel... %d strings gone!\n", len); + recv += len; - do { + /* + * debug purpose: prints out all the string list + * elements + */ + g_list_foreach(strlist->glist, + (GFunc) gmyth_monitor_handler_print, + NULL); - gint bytes_sent = 0; + back_msg_action = g_new0(gchar, 1); + msg_type = gmyth_monitor_handler_is_backend_message(monitor, + strlist, + &back_msg_action); - strlist = gmyth_string_list_new(); - - if (monitor->event_sock != NULL) { - - len = - gmyth_socket_read_stringlist(monitor->event_sock, - strlist); - - if ((len > 0) && strlist != NULL - && gmyth_string_list_length(strlist) > 0) { - bytes_sent = gmyth_string_list_get_int(strlist, 0); // -1 - // - // - // on - // backend - // error - - gmyth_debug - ("[%s] MONITOR: received data buffer from IO event channel... %d strings gone!\n", - __FUNCTION__, len); - - recv += len; - - /* - * debug purpose: prints out all the string list - * elements - */ - g_list_foreach(strlist->glist, - (GFunc) gmyth_monitor_handler_print, - NULL); - - gchar *back_msg_action = g_new0(gchar, 1); - gint msg_type = - gmyth_monitor_handler_is_backend_message(monitor, - strlist, - &back_msg_action); - - if (monitor != NULL - && msg_type != GMYTH_BACKEND_NO_MESSAGE) - g_signal_emit(monitor, GMYTH_MONITOR_HANDLER_GET_CLASS(monitor)->backend_events_handler_signal_id, 0, /* details - */ - msg_type, back_msg_action); - - if (back_msg_action != NULL) - g_free(back_msg_action); - - } - - } - - if (strlist != NULL) { - g_object_unref(strlist); - strlist = NULL; - } - - io_cond = g_io_channel_get_buffer_condition(io_channel); - - g_usleep(500); - + if (msg_type != GMYTH_BACKEND_NO_MESSAGE) { + g_signal_emit(monitor, + GMYTH_MONITOR_HANDLER_GET_CLASS(monitor)->backend_events_handler_signal_id, + 0, msg_type, back_msg_action); } - while (recv <= 0 && ((io_cond & G_IO_HUP) == 0)); - gmyth_debug("\tMONITOR EVENT: Read %d bytes\n", recv); + if (back_msg_action != NULL) + g_free(back_msg_action); - } /* main GThread while */ + g_object_unref(strlist); + } - clean_up: +clean_up: myth_control_release_context(monitor); - - g_thread_exit(ret); - - return (gpointer) ret; - + return TRUE; } -/** +/** * Opens connection events' socket the the Monitor socket on * MythTV backend server. * @@ -616,7 +505,7 @@ * * @return <code>true</code>, if the socket was successfully opened. */ -static gboolean +static gboolean gmyth_connect_to_backend_monitor(GMythMonitorHandler * monitor) { gboolean ret = TRUE; @@ -625,7 +514,7 @@ /* * Connects the socket, send Mythtv ANN Monitor and verify Mythtv - * protocol version + * protocol version */ if (!gmyth_socket_connect_to_backend_events(monitor->event_sock, monitor->hostname, @@ -638,52 +527,38 @@ return ret; } -/** +/** * Opens connection the the Monitor socket on MythTV backend server, * where all status messages are notified to the client. - * + * * @param monitor The GMythMonitorHandler instance. * @param channel The GIOChannel instance to the Monitor socket. - * + * * @return Pointer to the boolean value, and it is <code>true</code> only if the - * GMythMonitorHandler could be configured. + * GMythMonitorHandler could be configured. */ -static gboolean +static gboolean gmyth_monitor_handler_setup(GMythMonitorHandler * monitor, GIOChannel * channel) { - gboolean ret = TRUE; + gboolean ret = TRUE; if (channel != NULL) { monitor->allow_msgs_listener = TRUE; - - monitor->th = - g_thread_create((GThreadFunc) gmyth_monitor_handler_listener, - monitor, TRUE, NULL); - gmyth_debug("MONITOR GThread created!"); + monitor->io_source = g_io_add_watch (channel, G_IO_IN | G_IO_ERR | G_IO_HUP, + gmyth_monitor_handler_listener, + monitor); } else { ret = FALSE; - goto cleanup; } - - if (NULL == monitor->th) { - gmyth_debug - ("[%s] Error adding GThread listener function to the IO control channel!\n", - __FUNCTION__); - ret = FALSE; - goto cleanup; - } - - cleanup: - return ret; } -/** +/** * Starts the MonitorHandler thread to the GIOWatcher. - * + * * @param monitor The GMythMonitorHandler instance. - * + * * @return <code>true</code>, if the MonitorHandler was started. */ gboolean Modified: trunk/gmyth/src/gmyth_monitor_handler.h =================================================================== --- trunk/gmyth/src/gmyth_monitor_handler.h 2007-08-29 09:00:25 UTC (rev 836) +++ trunk/gmyth/src/gmyth_monitor_handler.h 2007-08-29 13:29:24 UTC (rev 837) @@ -63,12 +63,12 @@ GObjectClass parent_class; /* - * callbacks + * callbacks */ guint backend_events_handler_signal_id; /* - * signal default handlers + * signal default handlers */ void (*backend_events_handler) (GMythMonitorHandler * monitor, gint msg_code, @@ -88,14 +88,8 @@ */ GMythSocket *event_sock; + //gpointer(*gmyth_monitor_handler_listener) (gpointer data); - - - - - - gpointer(*gmyth_monitor_handler_listener) (gpointer data); - gchar *hostname; gint port; @@ -109,9 +103,7 @@ GHashTable *backend_msgs; GMutex *mutex; - - GThread *th; - + guint io_source; }; GType gmyth_monitor_handler_get_type(void); Modified: trunk/gmyth-stream/gmemcoder/src/gmencoder.c =================================================================== --- trunk/gmyth-stream/gmemcoder/src/gmencoder.c 2007-08-29 09:00:25 UTC (rev 836) +++ trunk/gmyth-stream/gmemcoder/src/gmencoder.c 2007-08-29 13:29:24 UTC (rev 837) @@ -866,7 +866,6 @@ GstElement *bsrc = NULL; GstElement *src = NULL; - GstElement *queue = NULL; GstElement *aqueue = NULL; GstElement *vqueue = NULL; GstElement *decode = NULL; @@ -888,11 +887,10 @@ if (src == NULL) goto error; - decode = gst_element_factory_make("decodebin", "decode"); + decode = gst_element_factory_make("decodebin2", "decode"); if (decode == NULL) goto error; - queue = gst_element_factory_make("queue", "queue_src"); aqueue = gst_element_factory_make("queue", "aqueue"); if (aqueue == NULL) goto error; @@ -901,9 +899,9 @@ if (vqueue == NULL) goto error; - gst_bin_add_many(GST_BIN(bsrc), src, queue, decode, aqueue, vqueue, + gst_bin_add_many(GST_BIN(bsrc), src, decode, aqueue, vqueue, NULL); - gst_element_link_many(src, queue, decode, NULL); + gst_element_link (src, decode); g_signal_connect(G_OBJECT(decode), "new-decoded-pad", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <me...@us...> - 2007-10-23 12:58:16
|
Revision: 869 http://gmyth.svn.sourceforge.net/gmyth/?rev=869&view=rev Author: melunko Date: 2007-10-23 05:58:20 -0700 (Tue, 23 Oct 2007) Log Message: ----------- Version changed to 0.4.1. Small changes in the debian/control to correct libcurl dependencies Modified Paths: -------------- trunk/gmyth/configure.ac trunk/gmyth/debian/changelog trunk/gmyth/debian/control Modified: trunk/gmyth/configure.ac =================================================================== --- trunk/gmyth/configure.ac 2007-10-15 18:00:20 UTC (rev 868) +++ trunk/gmyth/configure.ac 2007-10-23 12:58:20 UTC (rev 869) @@ -3,14 +3,14 @@ AC_PREREQ(2.50) -AC_INIT([gmyth],[0.4]) +AC_INIT([gmyth],[0.4.1]) AC_CONFIG_SRCDIR([src/gmyth.h]) AC_CONFIG_HEADER(config.h) dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, SVN and prerelease does Werror too -AS_VERSION(gmyth, GMYTH, 0, 4, 0, 0, GMYTH_SVN="no", GMYTH_SVN="yes") +AS_VERSION(gmyth, GMYTH, 0, 4, 1, 0, GMYTH_SVN="no", GMYTH_SVN="yes") GMYTH_MAJORMINOR=$GMYTH_MAJOR_VERSION.$GMYTH_MINOR_VERSION AC_SUBST(GMYTH_MAJORMINOR) Modified: trunk/gmyth/debian/changelog =================================================================== --- trunk/gmyth/debian/changelog 2007-10-15 18:00:20 UTC (rev 868) +++ trunk/gmyth/debian/changelog 2007-10-23 12:58:20 UTC (rev 869) @@ -1,3 +1,9 @@ +gmyth (0.4.1-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 Modified: trunk/gmyth/debian/control =================================================================== --- trunk/gmyth/debian/control 2007-10-15 18:00:20 UTC (rev 868) +++ trunk/gmyth/debian/control 2007-10-23 12:58:20 UTC (rev 869) @@ -1,7 +1,7 @@ Source: gmyth Priority: optional Maintainer: Hallyson Melo <hal...@in...> -Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), libcurl3, libcurl3-openssl-dev, libxml2-dev, libglib2.0-dev, libmysqlclient15-dev | libmysqlclient14-dev +Build-Depends: debhelper (>= 4.0.0), autotools-dev, cdbs (>= 0.4.0), libcurl3, libcurl3-openssl-dev | libcurl3-gnutls-dev, libxml2-dev, libglib2.0-dev, libmysqlclient15-dev | libmysqlclient14-dev Standards-Version: 3.6.2 Section: user/library @@ -14,12 +14,12 @@ Package: gmyth-dev Section: user/library Architecture: any -Depends: gmyth (= ${Source-Version}), libcurl3, libcurl3-openssl-dev, libxml2-dev, libglib2.0-dev, libmysqlclient15-dev | libmysqlclient14-dev +Depends: gmyth (= ${Source-Version}), libcurl3, libcurl3-openssl-dev | libcurl3-gnutls-dev, libxml2-dev, libglib2.0-dev, libmysqlclient15-dev | libmysqlclient14-dev Description: The gmyth library development files. GMyth is a library intended to access mythtv backend functionalities from a glib/gobject perspective. It includes access to the program guide, recorded programs, scheduling, etc. Package: gmyth-utils Section: user/multimedia Architecture: any -Depends: gmyth (= ${Source-Version}) +Depends: gmyth (= ${binary:Version}) Description: The gmyth utils package. It contain the application gmyth-cat. 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...> - 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...> - 2008-02-20 20:31:04
|
Revision: 925 http://gmyth.svn.sourceforge.net/gmyth/?rev=925&view=rev Author: renatofilho Date: 2008-02-20 12:30:13 -0800 (Wed, 20 Feb 2008) Log Message: ----------- fixex fps property Modified Paths: -------------- trunk/gmyth/configure.ac trunk/gmyth-stream/gmencoder/src/gmencoder.c Modified: trunk/gmyth/configure.ac =================================================================== --- trunk/gmyth/configure.ac 2008-02-15 13:52:23 UTC (rev 924) +++ trunk/gmyth/configure.ac 2008-02-20 20:30:13 UTC (rev 925) @@ -8,12 +8,6 @@ AC_CONFIG_SRCDIR([src/gmyth.h]) AC_CONFIG_HEADER(config.h) -dnl when going to/from release please set the nano (fourth number) right ! -dnl releases only do Wall, SVN and prerelease does Werror too -AS_VERSION(gmyth, GMYTH, 0, 7, 0, 0, GMYTH_SVN="no", GMYTH_SVN="yes") -GMYTH_MAJORMINOR=$GMYTH_MAJOR_VERSION.$GMYTH_MINOR_VERSION -AC_SUBST(GMYTH_MAJORMINOR) - dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode AM_MAINTAINER_MODE dnl make aclocal work in maintainer mode Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c =================================================================== --- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-02-15 13:52:23 UTC (rev 924) +++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-02-20 20:30:13 UTC (rev 925) @@ -469,7 +469,7 @@ GstElement *vscale; vscale = gst_element_factory_make("videoscale", "vscale"); - //g_object_set (G_OBJECT (vscale), "method", 1, NULL); + 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", @@ -491,6 +491,7 @@ if (fps > 0) { // Changing the video fps + g_debug ("Changing FPS TO : %5.2f", fps); GstCaps *vcaps; vrate = gst_element_factory_make("videorate", "vrate"); @@ -503,7 +504,7 @@ vcaps = gst_caps_new_simple("video/x-raw-yuv", "framerate", GST_TYPE_FRACTION, - (int) (fps * 1000), 1000, + (int) fps, 1, NULL); if (gst_element_link_filtered(vrate, vencode, vcaps) == FALSE) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ren...@us...> - 2008-02-25 13:49:54
|
Revision: 930 http://gmyth.svn.sourceforge.net/gmyth/?rev=930&view=rev Author: renatofilho Date: 2008-02-25 05:49:59 -0800 (Mon, 25 Feb 2008) Log Message: ----------- removed upnp dependency Modified Paths: -------------- trunk/gmyth/AUTHORS trunk/gmyth/configure.ac trunk/gmyth/samples/Makefile.am Removed Paths: ------------- trunk/gmyth/samples/gmyth_upnp_search.c Modified: trunk/gmyth/AUTHORS =================================================================== --- trunk/gmyth/AUTHORS 2008-02-21 22:49:45 UTC (rev 929) +++ trunk/gmyth/AUTHORS 2008-02-25 13:49:59 UTC (rev 930) @@ -2,3 +2,4 @@ Hallyson Luiz de Morais Melo <hal...@in...> Leonardo Sobral Cunha <leo...@in...> Rosfran Lins Borges <ros...@in...> +Renato Araujo Oliveira Filho <ren...@in...> Modified: trunk/gmyth/configure.ac =================================================================== --- trunk/gmyth/configure.ac 2008-02-21 22:49:45 UTC (rev 929) +++ trunk/gmyth/configure.ac 2008-02-25 13:49:59 UTC (rev 930) @@ -144,20 +144,6 @@ CFLAGS="$CFLAGS -pg" fi -AC_ARG_ENABLE(upnp, - AS_HELP_STRING([--enable-upnp], - [enable clinkc's UPnP library (default = no)]), - [ - if test $enableval = no; then - USE_UPNP=no; - else - USE_UPNP=yes; - fi - ],[ - USE_UPNP=no; - ] -) - # Check for pkgconfig AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no) # Give error and exit if we don't have pkgconfig @@ -227,17 +213,6 @@ AC_SUBST(LIBCURL_CFLAGS) AC_SUBST(LIBCURL_LIBS) -if [ test $USE_UPNP = yes ]; then - # checks if the gmyth-upnp library can be found - PKG_CHECK_MODULES(UPNP, gmyth-upnp, HAVE_UPNP=yes, HAVE_UPNP=no) - if test "x$HAVE_UPNP" = "xyes"; then - AC_DEFINE(HAVE_UPNP, 1, [GMyth UPnP library found!]) - CFLAGS="$CFLAGS -DHAVE_UPNP" - fi -fi - -AM_CONDITIONAL(HAVE_UPNP, test "x$HAVE_UPNP" = "xyes") - # # mysql libraries # Modified: trunk/gmyth/samples/Makefile.am =================================================================== --- trunk/gmyth/samples/Makefile.am 2008-02-21 22:49:45 UTC (rev 929) +++ trunk/gmyth/samples/Makefile.am 2008-02-25 13:49:59 UTC (rev 930) @@ -1,20 +1,11 @@ bin_PROGRAMS = gmyth-cat gmyth-ls -if HAVE_UPNP -bin_PROGRAMS += gmyth-upnp-search -endif - gmyth_cat_SOURCES = \ gmyth_cat.c gmyth_ls_SOURCES = \ gmyth_ls.c -if HAVE_UPNP -gmyth_upnp_search_SOURCES = \ - gmyth_upnp_search.c -endif - LDADD = \ $(top_builddir)/src/libgmyth.la @@ -28,12 +19,3 @@ -I$(top_srcdir)/src \ $(GLIB_CFLAGS) \ $(GOBJECT_CFLAGS) - -if HAVE_UPNP -INCLUDES += \ - $(UPNP_CFLAGS) - -AM_LDFLAGS += \ - $(UPNP_LIBS) -endif - Deleted: trunk/gmyth/samples/gmyth_upnp_search.c =================================================================== --- trunk/gmyth/samples/gmyth_upnp_search.c 2008-02-21 22:49:45 UTC (rev 929) +++ trunk/gmyth/samples/gmyth_upnp_search.c 2008-02-25 13:49:59 UTC (rev 930) @@ -1,123 +0,0 @@ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <stdio.h> -#include <glib.h> - -#include <gmyth-upnp/gmyth_upnp.h> - -#include "gmyth_backendinfo.h" -#include "gmyth_file_transfer.h" -#include "gmyth_livetv.h" -#include "gmyth_util.h" -#include "gmyth_common.h" - -typedef struct { - GMythBackendInfo *b_info; - gchar *mythtv_id; -} gupnp_options_t; - -static gupnp_options_t * -_gupnp_options_new() -{ - gupnp_options_t *options = g_new0(gupnp_options_t, 1); - options->b_info = gmyth_backend_info_new(); - - return options; -} - -static void -_gupnp_options_free(gupnp_options_t * options) -{ - g_return_if_fail(options != NULL); - - if (options->b_info) - g_object_unref(options->b_info); - g_free(options->mythtv_id); -} - -static gboolean -_parse_args(int argc, char *argv[], gupnp_options_t * options) -{ - GError *error = NULL; - GOptionContext *context; - - gchar *mythtv_id = NULL; - - GOptionEntry entries[] = { - {"mythtvid", 'm', 0, G_OPTION_ARG_STRING, &mythtv_id, - "MythTV UPnP service " "identifigupnpion", "UPNP_ID"}, - - {NULL} - }; - - g_return_val_if_fail(options != NULL, FALSE); - - context = - g_option_context_new - ("- searches for a list of connected mythtv backend recorded " - "file and prints it on the standard output\n"); - g_option_context_add_main_entries(context, entries, NULL); - g_option_context_parse(context, &argc, &argv, &error); - g_option_context_set_help_enabled(context, TRUE); - - g_option_context_free(context); - - g_free(mythtv_id); - - return TRUE; -} - - -static void -_got_upnp_device(GMythUPnP * gupnp, GMythUPnPDeviceStatus status, - gchar * udn) -{ - g_debug("Got Device !!! [%s, %s]", - gmyth_upnp_device_status_to_string(status), udn); -} - -static gboolean -_gupnp_search_devices(gupnp_options_t * options) -{ - GList *upnp_servers = NULL; - GMythUPnP *gupnp; - GMythBackendInfo *backend_info = gmyth_backend_info_new(); - - g_return_val_if_fail(options != NULL, FALSE); - g_return_val_if_fail(options->b_info != NULL, FALSE); - - gupnp = gmyth_upnp_new(backend_info, _got_upnp_device); - upnp_servers = gmyth_upnp_do_search_sync(gupnp); - - g_list_free(upnp_servers); - g_object_unref(gupnp); - - return TRUE; -} - -int -main(int argc, char *argv[]) -{ - gboolean res = FALSE; - gupnp_options_t *options; - - g_type_init(); - if (!g_thread_supported()) - g_thread_init(NULL); - - options = _gupnp_options_new(); - res = _parse_args(argc, argv, options); - if (!res) { - g_printerr("Argument invalid. Type --help\n"); - return 1; - } - - res = _gupnp_search_devices(options); - - _gupnp_options_free(options); - - return 0; -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ren...@us...> - 2008-02-25 17:45:42
|
Revision: 933 http://gmyth.svn.sourceforge.net/gmyth/?rev=933&view=rev Author: renatofilho Date: 2008-02-25 09:45:36 -0800 (Mon, 25 Feb 2008) Log Message: ----------- fixed autotools script. patch by Andre Moreira <and...@gm...> Modified Paths: -------------- trunk/gmyth/Makefile.am trunk/gmyth/configure.ac trunk/gmyth/src/Makefile.am trunk/gmyth/tests/Makefile.am Modified: trunk/gmyth/Makefile.am =================================================================== --- trunk/gmyth/Makefile.am 2008-02-25 14:14:29 UTC (rev 932) +++ trunk/gmyth/Makefile.am 2008-02-25 17:45:36 UTC (rev 933) @@ -1,31 +1,11 @@ SUBDIRS= src samples tests -### all of the standard pc files we need to generate -#pcfiles = gmyth-@GMYTH_MAJORMINOR@.pc -pcfiles = gmyth.pc - -all-local: $(pcfiles) - -### how to generate pc files -#%-@GMYTH_MAJORMINOR@.pc: %.pc -# cp $< $@ - pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(pcfiles) +pkgconfig_DATA = gmyth.pc -if HAVE_INDENT -indent: - cd src; \ - make indent; \ - cd .. -endif - -include aminclude.am - -EXTRA_DIST = \ - autogen.sh \ - gmyth.pc.in \ - AUTHORS \ - COPYING \ - README - +EXTRA_DIST = \ + autogen.sh \ + gmyth.pc.in \ + AUTHORS \ + COPYING \ + README Modified: trunk/gmyth/configure.ac =================================================================== --- trunk/gmyth/configure.ac 2008-02-25 14:14:29 UTC (rev 932) +++ trunk/gmyth/configure.ac 2008-02-25 17:45:36 UTC (rev 933) @@ -1,154 +1,47 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. +AC_INIT(gmyth, 0.7.0) +AC_PREREQ(2.52) +AC_CONFIG_SRCDIR(configure.ac) +AC_CANONICAL_BUILD +AC_CANONICAL_HOST +AC_ISC_POSIX -AC_PREREQ(2.50) +AM_INIT_AUTOMAKE(1.6 dist-bzip2) +AM_CONFIG_HEADER(config.h) -AC_INIT([gmyth],[0.7.0]) - -AC_CONFIG_SRCDIR([src/gmyth.h]) -AC_CONFIG_HEADER(config.h) - -dnl AM_MAINTAINER_MODE provides the option to enable maintainer mode -AM_MAINTAINER_MODE dnl make aclocal work in maintainer mode AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") -# Checks for programs. -# check for tools -# Make sure CFLAGS is defined to stop AC_PROC_CC adding -g -CFLAGS="$CFLAGS -Wall" +AC_PROG_CXX AC_PROG_CC -AC_PROG_LIBTOOL - -dnl Generate doxygen documentation -DX_HTML_FEATURE(ON) -DX_CHM_FEATURE(OFF) -DX_CHI_FEATURE(OFF) -DX_MAN_FEATURE(OFF) -DX_RTF_FEATURE(OFF) -DX_XML_FEATURE(OFF) -DX_PDF_FEATURE(OFF) -DX_PS_FEATURE(OFF) -DX_INIT_DOXYGEN(gmyth, doxygen.cfg, docs) - - -# Checks for libraries. - -# Checks for header files. +AM_PROG_CC_STDC AC_HEADER_STDC -AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. +AC_C_BIGENDIAN AC_C_CONST -AC_TYPE_PID_T -AC_STRUCT_TM -AC_HEADER_TIME -AC_HEADER_STDBOOL -# Checks for library functions. -AC_FUNC_FORK -AC_FUNC_STRFTIME -AC_FUNC_SELECT_ARGTYPES -AC_PROG_GCC_TRADITIONAL -AC_FUNC_MALLOC -AC_FUNC_MKTIME -AC_FUNC_STRFTIME -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([memset socket stime strstr strtoul gethostname inet_ntoa localtime_r select strrchr localtime strptime]) +AC_LIBTOOL_WIN32_DLL +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl +AC_PROG_LIBTOOL -############################## -# Checks for Network functions -############################## - -AC_CHECK_FUNCS([socket]) -AC_CHECK_FUNCS([inet_ntoa]) -AC_CHECK_HEADERS([ifaddrs.h]) -AC_CHECK_FUNCS([getifaddrs]) -AC_CHECK_FUNCS([time]) - -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) - -CFLAGS="$CFLAGS -I/usr/include" -LDFLAGS="$LDFLAGS -L/usr/lib" - -# Checks required packages - dnl Test if --enable-debug given AC_ARG_ENABLE(debug, - [AC_HELP_STRING([--enable-debug], [enable debugging mode])], + AC_HELP_STRING([--enable-debug], [enable debugging mode]), enable_debug="$enableval", enable_debug=no) if test "x$enable_debug" = "xyes" ; then - AC_DEFINE(GMYTH_USE_DEBUG, 1, [Debug enabled!]) - CFLAGS="$CFLAGS -g -DGMYTH_USE_DEBUG" + AC_DEFINE(GMYTH_USE_DEBUG, 1, [Debug enabled!]) + CFLAGS="$CFLAGS -Wall -O0 -g -DGMYTH_USE_DEBUG" else - CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS" + CFLAGS="$CFLAGS -Wall -O2" fi AM_CONDITIONAL(GMYTH_USE_DEBUG, test "x$enable_debug" = "xyes") -AC_ARG_ENABLE(coverage, - AS_HELP_STRING([--enable-coverage], - [enable coverage (default = no)]), - [ - if test $enableval = no; then - USE_COVERAGE=no; - else - USE_COVERAGE=yes; - fi - ],[ - USE_COVERAGE=no; - ] -) - -if [ test $USE_COVERAGE = yes ]; then - CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage -O0" - LDFLAGS="$LDFLAGS -lgcov" -fi - -AC_ARG_ENABLE(mudflap-debug, - AS_HELP_STRING([--enable-mudflap-debug], - [enable libmudflap debug (default = no)]), - [ - if test $enableval = no; then - USE_MUDFLAP_DEBUG=no; - else - USE_MUDFLAP_DEBUG=yes; - fi - ],[ - USE_MUDFLAP_DEBUG=no; - ] -) - -if [ test $USE_MUDFLAP_DEBUG = yes ]; then - CFLAGS="$CFLAGS -fmudflap -fmudflapth -O0" - LDFLAGS="$LDFLAGS -lmudflapth" -fi - -AC_ARG_ENABLE(profiling, - AS_HELP_STRING([--enable-profiling], - [enable GNU profiling (default = no)]), - [ - if test $enableval = no; then - USE_PROFILING=no; - else - USE_PROFILING=yes; - fi - ],[ - USE_PROFILING=no; - ] -) - -if [ test $USE_PROFILING = yes ]; then - CFLAGS="$CFLAGS -pg" -fi - # Check for pkgconfig AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no) # Give error and exit if we don't have pkgconfig if test "x$HAVE_PKGCONFIG" = "xno"; then - AC_MSG_ERROR(you need to have pkgconfig installed !) + AC_MSG_ERROR(you need to have pkgconfig installed !) fi # Check for Glib2.0 @@ -156,7 +49,7 @@ # Give error and exit if we don't have glib if test "x$HAVE_GLIB" = "xno"; then - AC_MSG_ERROR(you need glib-2.0 installed) + AC_MSG_ERROR(you need glib-2.0 installed) fi # make GLIB_CFLAGS and GLIB_LIBS available @@ -165,12 +58,12 @@ # Check for GObject2.0 PKG_CHECK_MODULES(GOBJECT, - gobject-2.0, - HAVE_GOBJECT=yes, HAVE_GOBJECT=no) + gobject-2.0, + HAVE_GOBJECT=yes, HAVE_GOBJECT=no) # Give error and exit if we don't have gobject if test "x$HAVE_GOBJECT" = "xno"; then - AC_MSG_ERROR(you need gobject-2.0 installed) + AC_MSG_ERROR(you need gobject-2.0 installed) fi # make GOBJECT_CFLAGS and GOBJECT_LIBS available @@ -182,7 +75,7 @@ # Give error and exit if we don't have glib if test "x$HAVE_GTHREAD" = "xno"; then - AC_MSG_ERROR(you need gthread+-2.0 installed) + AC_MSG_ERROR(you need gthread+-2.0 installed) fi # make GTHREAD_CFLAGS and GTHREAD_LIBS available @@ -194,7 +87,7 @@ # Give error and exit if we don't have libxml if test "x$HAVE_LIBXML" = "xno"; then - AC_MSG_ERROR(you need libxml-2.0 installed) + AC_MSG_ERROR(you need libxml-2.0 installed) fi # make LIBXML_CFLAGS and LIBXML_LIBS available @@ -206,16 +99,14 @@ # Give error and exit if we don't have libcurl if test "x$HAVE_LIBCURL" = "xno"; then - AC_MSG_ERROR(you need libcurl installed) + AC_MSG_ERROR(you need libcurl installed) fi # make LIBCURL_CFLAGS and LIBCURL_LIBS available AC_SUBST(LIBCURL_CFLAGS) AC_SUBST(LIBCURL_LIBS) -# -# mysql libraries -# +# check for mysql AC_CHECK_PROG(MYSQL_CFLAGS,mysql_config,`mysql_config --cflags`) if test -z "$MYSQL_CFLAGS"; then AC_MSG_ERROR([Could not find mysql_config script. Make sure the mysql client libraries are installed]) @@ -228,55 +119,15 @@ fi AC_SUBST(MYSQL_LIBS) -#dnl Enable gtk-doc -#GTK_DOC_CHECK(1.4) - -# checks if the indent tool can be found -AC_CHECK_PROG(HAVE_INDENT, indent, [Found!]) -if test -n "$HAVE_INDENT"; then - AC_DEFINE(HAVE_INDENT, 1, [AutoIndent found!]) -fi - -AM_CONDITIONAL(HAVE_INDENT, test -n "$HAVE_INDENT") - -# checks if the gprof tool can be found -AC_CHECK_PROG(HAVE_GPROF, gprof, [Found!]) -if test -n "$HAVE_GPROF"; then - AC_DEFINE(HAVE_GPROF, 1, [Gnu Profiling tool found!]) -fi - -AM_CONDITIONAL(HAVE_GPROF, test -n "$HAVE_GPROF") - -# checks if the gcov tool can be found -AC_CHECK_PROG(HAVE_GCOV, gcov, [Found!]) -if test -n "$HAVE_GCOV"; then - AC_DEFINE(HAVE_GCOV, 1, [Gnu Coverage tool found!]) -fi - -AM_CONDITIONAL(HAVE_GCOV, test -n "$HAVE_GCOV") - -# checks if the genhtml tool can be found -AC_CHECK_PROG(HAVE_GENHTML, genhtml, [Found!]) -if test -n "$HAVE_GENHTML"; then - AC_DEFINE(HAVE_GENHTML, 1, [Gnu Coverage HTML report generator found!]) -fi - -AM_CONDITIONAL(HAVE_GENHTML, test -n "$HAVE_GENHTML") - -AC_SUBST(CFLAGS) -AC_SUBST(LDFLAGS) -AC_SUBST(LIBS) - -AC_OUTPUT([ +AC_OUTPUT( Makefile src/Makefile samples/Makefile tests/Makefile -gmyth.pc]) +gmyth.pc) if test "x$enable_debug" != "xno"; then - AC_MSG_NOTICE([Debug: Enabled]) + AC_MSG_NOTICE([Debug: Enabled]) else - AC_MSG_NOTICE([Debug: Disabled]) + AC_MSG_NOTICE([Debug: Disabled]) fi - Modified: trunk/gmyth/src/Makefile.am =================================================================== --- trunk/gmyth/src/Makefile.am 2008-02-25 14:14:29 UTC (rev 932) +++ trunk/gmyth/src/Makefile.am 2008-02-25 17:45:36 UTC (rev 933) @@ -1,14 +1,12 @@ -SUBDIRS = . - lib_LTLIBRARIES = libgmyth.la INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src @GLIB_CFLAGS@ @GOBJECT_CFLAGS@ -BUILT_SOURCES = \ - gmyth_marshal.c \ +BUILT_SOURCES = \ + gmyth_marshal.c \ gmyth_marshal.h -libgmyth_la_SOURCES = \ +libgmyth_la_SOURCES = \ gmyth_common.c \ gmyth_debug.c \ gmyth_epg.c \ @@ -48,7 +46,7 @@ mv gmyth_marshal.c.tmp gmyth_marshal.c libgmyth_la_CFLAGS = \ - -DDATADIR=\"$(pkgdatadir)\" \ + -DDATADIR=\"$(pkgdatadir)\" \ $(GLIB_CFLAGS) \ $(GOBJECT_CFLAGS) \ $(GST_CFLAGS) \ @@ -57,32 +55,32 @@ $(MYSQL_CFLAGS) \ $(LIBXML_CFLAGS) -libgmyth_la_LDFLAGS = \ - -export-dynamic \ - $(GLIB_CFLAGS) \ +libgmyth_la_LDFLAGS = \ + -export-dynamic \ + $(GLIB_CFLAGS) \ $(GOBJECT_CFLAGS) \ - $(MYSQL_LIBS) \ - $(GST_LIBS) \ + $(MYSQL_LIBS) \ + $(GST_LIBS) \ $(GSTBASE_LIBS) \ $(GSTPLUGINS_LIBS) \ $(LIBXML_LIBS) -libgmyth_includedir = \ +libgmyth_includedir = \ $(pkgincludedir) -libgmyth_include_HEADERS = \ +libgmyth_include_HEADERS = \ gmyth.h \ gmyth_common.h \ gmyth_debug.h \ - gmyth_epg.h \ - gmyth_recorder.h \ - gmyth_scheduler.h \ - gmyth_tvchain.h \ - gmyth_util.h \ - gmyth_query.h \ - gmyth_socket.h \ + gmyth_epg.h \ + gmyth_recorder.h \ + gmyth_scheduler.h \ + gmyth_tvchain.h \ + gmyth_util.h \ + gmyth_query.h \ + gmyth_socket.h \ gmyth_remote_util.h \ - gmyth_stringlist.h \ + gmyth_stringlist.h \ gmyth_monitor_handler.h \ gmyth_file_transfer.h \ gmyth_livetv.h \ @@ -97,20 +95,4 @@ gmyth_file.h \ gmyth_file_local.h -if HAVE_INDENT -indent: - @for src_file in $(libgmyth_la_SOURCES); do \ - ./gmyth-indent.sh $$src_file; \ - done; \ - for inc_file in $(libgmyth_include_HEADERS); do \ - ./gmyth-indent.sh $$inc_file; \ - done; -endif - CLEANFILES = $(BUILT_SOURCES) - -if HAVE_GCOV -CLEANFILES += *.gcda \ - *.gcno \ - *.gcov -endif Modified: trunk/gmyth/tests/Makefile.am =================================================================== --- trunk/gmyth/tests/Makefile.am 2008-02-25 14:14:29 UTC (rev 932) +++ trunk/gmyth/tests/Makefile.am 2008-02-25 17:45:36 UTC (rev 933) @@ -1,8 +1,8 @@ LDADD = \ - $(top_srcdir)/src/.libs/libgmyth.la + $(top_srcdir)/src/libgmyth.la AM_LDFLAGS = \ - @GLIB_LIBS@ @GOBJECT_LIBS@ @GTHREAD_LIBS@ @LIBCURL_LIBS@ + @GLIB_LIBS@ @GOBJECT_LIBS@ @GTHREAD_LIBS@ @LIBCURL_LIBS@ INCLUDES = \ -I$(top_srcdir) \ @@ -53,11 +53,6 @@ test_stringlist.py \ test_tvchain.py -if HAVE_GENHTML -TESTS += \ - coverage.py -endif - TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) test_SOURCES = \ @@ -109,15 +104,3 @@ gmyth_test_tvchain.c CLEANFILES = $(BUILT_SOURCES) - -if HAVE_GCOV -CLEANFILES += \ - *.gcda \ - *.gcno \ - *.gcov -endif - -if HAVE_GPROF -CLEANFILES += gmon.out -endif - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ren...@us...> - 2008-02-25 18:10:26
|
Revision: 936 http://gmyth.svn.sourceforge.net/gmyth/?rev=936&view=rev Author: renatofilho Date: 2008-02-25 10:09:36 -0800 (Mon, 25 Feb 2008) Log Message: ----------- fixed autotools scripst Modified Paths: -------------- trunk/gmyth/Makefile.am trunk/gmyth/autogen.sh trunk/gmyth/configure.ac trunk/gmyth/m4/Makefile.am Removed Paths: ------------- trunk/gmyth/common/ Modified: trunk/gmyth/Makefile.am =================================================================== --- trunk/gmyth/Makefile.am 2008-02-25 18:04:30 UTC (rev 935) +++ trunk/gmyth/Makefile.am 2008-02-25 18:09:36 UTC (rev 936) @@ -1,4 +1,5 @@ SUBDIRS= gmyth samples tests +DIST_SUBDIRS= m4 gmyth samples tests pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gmyth.pc Modified: trunk/gmyth/autogen.sh =================================================================== --- trunk/gmyth/autogen.sh 2008-02-25 18:04:30 UTC (rev 935) +++ trunk/gmyth/autogen.sh 2008-02-25 18:09:36 UTC (rev 936) @@ -1,102 +1,19 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -DIE=0 -package=gmyth -srcfile=configure.ac +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. -# a quick cvs co if necessary to alleviate the pain - may remove this -# when developers get a clue ;) -if test ! -d common; -then - echo "+ getting common/ from svn" - svn co common -fi +PKG_NAME="gmythdbus" -# source helper functions -if test ! -f common/autogen-helper.sh; -then - echo There is something wrong with your source tree. - echo You are missing common/autogen-helper.sh - exit 1 -fi -. common/autogen-helper.sh - -CONFIGURE_DEF_OPT='--enable-maintainer-mode' -# uncomment below to disable the UPnP features -CONFIGURE_DEF_OPT="$CONFIGURE_DEF_OPT --disable-upnp" -CONFIGURE_EXT_OPT="$@" - -autogen_options - -echo -n "+ check for build tools" -if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi -version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53" \ - "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 53 || DIE=1 -version_check "automake" "$AUTOMAKE automake automake-1.9 automake-1.8 automake-1.7 automake-1.6" \ - "ftp://ftp.gnu.org/pub/gnu/automake/" 1 6 || DIE=1 -version_check "libtoolize" "$LIBTOOLIZE libtoolize" \ - "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1 -version_check "pkg-config" "" \ - "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 - -die_check $DIE - -aclocal_check || DIE=1 -autoheader_check || DIE=1 - -die_check $DIE - -# if no arguments specified then this will be printed -if test -z "$*"; then - echo "+ checking for autogen.sh options" - echo " This autogen script will automatically run ./configure as:" - echo " ./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT" - echo " To pass any additional options, please specify them on the $0" - echo " command line." -fi - -toplevel_check $srcfile - -tool_run "$aclocal" "-I m4 $ACLOCAL_FLAGS" -tool_run "$libtoolize" "--copy --force" -tool_run "$autoheader" - -# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo -echo timestamp > stamp-h.in 2> /dev/null - -tool_run "$autoconf" -tool_run "$automake" "-a -c" - -# if enable exists, add an -enable option for each of the lines in that file -if test -f enable; then - for a in `cat enable`; do - CONFIGURE_FILE_OPT="--enable-$a" - done -fi - -# if disable exists, add an -disable option for each of the lines in that file -if test -f disable; then - for a in `cat disable`; do - CONFIGURE_FILE_OPT="$CONFIGURE_FILE_OPT --disable-$a" - done -fi - -test -n "$NOCONFIGURE" && { - echo "+ skipping configure stage for package $package, as requested." - echo "+ autogen.sh done." - exit 0 +(test -f $srcdir/configure.ac) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level $PKG_NAME directory" + exit 1 } -echo "+ running configure ... " -test ! -z "$CONFIGURE_DEF_OPT" && echo " ./configure default flags: $CONFIGURE_DEF_OPT" -test ! -z "$CONFIGURE_EXT_OPT" && echo " ./configure external flags: $CONFIGURE_EXT_OPT" -test ! -z "$CONFIGURE_FILE_OPT" && echo " ./configure enable/disable flags: $CONFIGURE_FILE_OPT" -echo - -./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT $CONFIGURE_FILE_OPT || { - echo " configure failed" - exit 1 +which gnome-autogen.sh || { + echo "You need to install gnome-common from the GNOME CVS" + exit 1 } - -echo "Now type 'make' to compile $package." +REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh -I./m4 Modified: trunk/gmyth/configure.ac =================================================================== --- trunk/gmyth/configure.ac 2008-02-25 18:04:30 UTC (rev 935) +++ trunk/gmyth/configure.ac 2008-02-25 18:09:36 UTC (rev 936) @@ -121,6 +121,7 @@ AC_OUTPUT( Makefile +m4/Makefile gmyth/Makefile samples/Makefile tests/Makefile Modified: trunk/gmyth/m4/Makefile.am =================================================================== --- trunk/gmyth/m4/Makefile.am 2008-02-25 18:04:30 UTC (rev 935) +++ trunk/gmyth/m4/Makefile.am 2008-02-25 18:09:36 UTC (rev 936) @@ -1,10 +1,5 @@ -SUBDIRS= src pixmaps - -include aminclude.am - -EXTRA_DIST = \ - autogen.sh \ - AUTHORS \ - COPYING \ - README - +EXTRA_DIST = \ + ac_doxygen.m4 \ + as-compiler-flag.m4 \ + as-expand.m4 \ + as-version.m4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <me...@us...> - 2008-03-03 13:12:43
|
Revision: 945 http://gmyth.svn.sourceforge.net/gmyth/?rev=945&view=rev Author: melunko Date: 2008-03-03 05:11:54 -0800 (Mon, 03 Mar 2008) Log Message: ----------- gmyth library version incremented to 0.8 Modified Paths: -------------- trunk/gmyth/ChangeLog trunk/gmyth/configure.ac Modified: trunk/gmyth/ChangeLog =================================================================== --- trunk/gmyth/ChangeLog 2008-03-03 11:33:49 UTC (rev 944) +++ trunk/gmyth/ChangeLog 2008-03-03 13:11:54 UTC (rev 945) @@ -1,3 +1,9 @@ + +2008-03-03 Hallyson Melo <hal...@in...> + * GMyth 0.8. + * Now, set backend recording for livetv is working. + * Library is a lot more stable. + 2006-08-17 Rosfran Borges <ros...@in...> * Added the correct gstreamer-base package (GSTBASE) at the configure.ac; GSTBASE_CFLAGS and GSTBASE_LIBS variables had the same values from Modified: trunk/gmyth/configure.ac =================================================================== --- trunk/gmyth/configure.ac 2008-03-03 11:33:49 UTC (rev 944) +++ trunk/gmyth/configure.ac 2008-03-03 13:11:54 UTC (rev 945) @@ -1,4 +1,4 @@ -AC_INIT(gmyth, 0.7.1) +AC_INIT(gmyth, 0.8.0) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(configure.ac) AC_CANONICAL_BUILD This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <me...@us...> - 2008-03-13 16:29:36
|
Revision: 951 http://gmyth.svn.sourceforge.net/gmyth/?rev=951&view=rev Author: melunko Date: 2008-03-13 09:29:38 -0700 (Thu, 13 Mar 2008) Log Message: ----------- gmyth now is 0.8.1. Added methods epg_is_connected() and scheduler_is_connected() Modified Paths: -------------- trunk/gmyth/configure.ac trunk/gmyth/gmyth/gmyth_epg.c trunk/gmyth/gmyth/gmyth_epg.h trunk/gmyth/gmyth/gmyth_scheduler.c trunk/gmyth/gmyth/gmyth_scheduler.h Modified: trunk/gmyth/configure.ac =================================================================== --- trunk/gmyth/configure.ac 2008-03-04 13:57:55 UTC (rev 950) +++ trunk/gmyth/configure.ac 2008-03-13 16:29:38 UTC (rev 951) @@ -1,4 +1,4 @@ -AC_INIT(gmyth, 0.8.0) +AC_INIT(gmyth, 0.8.1) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(configure.ac) AC_CANONICAL_BUILD Modified: trunk/gmyth/gmyth/gmyth_epg.c =================================================================== --- trunk/gmyth/gmyth/gmyth_epg.c 2008-03-04 13:57:55 UTC (rev 950) +++ trunk/gmyth/gmyth/gmyth_epg.c 2008-03-13 16:29:38 UTC (rev 951) @@ -124,6 +124,14 @@ return TRUE; } +gboolean +gmyth_epg_is_connected (GMythEPG *gmyth_epg) +{ + g_return_val_if_fail (gmyth_epg != NULL, FALSE); + + return gmyth_query_is_alive (gmyth_epg->sqlquery); +} + /** Disconnects from the Mysql database in the backend. * * @param gmyth_epg the GMythEPG instance to be disconnected Modified: trunk/gmyth/gmyth/gmyth_epg.h =================================================================== --- trunk/gmyth/gmyth/gmyth_epg.h 2008-03-04 13:57:55 UTC (rev 950) +++ trunk/gmyth/gmyth/gmyth_epg.h 2008-03-13 16:29:38 UTC (rev 951) @@ -43,14 +43,7 @@ typedef struct _GMythEPGClass GMythEPGClass; struct _GMythEPGClass { - GObjectClass parent_class; - - /* - * callbacks - */ - /* - * no one for now - */ + GObjectClass parent_class; }; struct _GMythEPG { @@ -60,26 +53,28 @@ GMythBackendInfo *backend_info; }; -GType gmyth_epg_get_type (void) G_GNUC_CONST;; -GMythEPG* gmyth_epg_new (void); -gboolean gmyth_epg_connect (GMythEPG *gmyth_epg, - GMythBackendInfo *backend_info); -gboolean gmyth_epg_disconnect (GMythEPG *gmyth_epg); -gint gmyth_epg_get_channel_list (GMythEPG *gmyth_epg, - GList **glist_ptr); -gint gmyth_epg_get_program_list (GMythEPG *gmyth_epg, - GList **proglist, - gint chanNum, - GTimeVal *starttime, - GTimeVal *endtime); +GType gmyth_epg_get_type (void) G_GNUC_CONST;; +GMythEPG* gmyth_epg_new (void); +gboolean gmyth_epg_connect (GMythEPG *gmyth_epg, + GMythBackendInfo *backend_info); +gboolean gmyth_epg_is_connected (GMythEPG *gmyth_epg); + +gboolean gmyth_epg_disconnect (GMythEPG *gmyth_epg); +gint gmyth_epg_get_channel_list (GMythEPG *gmyth_epg, + GList **glist_ptr); +gint gmyth_epg_get_program_list (GMythEPG *gmyth_epg, + GList **proglist, + gint chanNum, + GTimeVal *starttime, + GTimeVal *endtime); GMythChannelInfo*gmyth_epg_get_channel_info (GMythEPG *gmyth_epg, gint channel_id); -gboolean gmyth_epg_channel_has_icon (GMythEPG *gmyth_epg, - GMythChannelInfo *channel); -gboolean gmyth_epg_channel_get_icon (GMythEPG *gmyth_epg, - GMythChannelInfo *channel, - guint8 **data, - guint *length); +gboolean gmyth_epg_channel_has_icon (GMythEPG *gmyth_epg, + GMythChannelInfo *channel); +gboolean gmyth_epg_channel_get_icon (GMythEPG *gmyth_epg, + GMythChannelInfo *channel, + guint8 **data, + guint *length); G_END_DECLS #endif /* GMYTH_EPG_H_ */ Modified: trunk/gmyth/gmyth/gmyth_scheduler.c =================================================================== --- trunk/gmyth/gmyth/gmyth_scheduler.c 2008-03-04 13:57:55 UTC (rev 950) +++ trunk/gmyth/gmyth/gmyth_scheduler.c 2008-03-13 16:29:38 UTC (rev 951) @@ -210,6 +210,14 @@ return TRUE; } +gboolean +gmyth_scheduler_is_connected (GMythScheduler *scheduler) +{ + g_return_val_if_fail (scheduler != NULL, FALSE); + + return gmyth_query_is_alive (scheduler->msqlquery); +} + /** Disconnects from the Mysql database in the backend. * * @param scheduler the GMythScheduler instance to be disconnected Modified: trunk/gmyth/gmyth/gmyth_scheduler.h =================================================================== --- trunk/gmyth/gmyth/gmyth_scheduler.h 2008-03-04 13:57:55 UTC (rev 950) +++ trunk/gmyth/gmyth/gmyth_scheduler.h 2008-03-13 16:29:38 UTC (rev 951) @@ -146,6 +146,7 @@ gboolean gmyth_scheduler_connect_with_timeout (GMythScheduler * scheduler, GMythBackendInfo * backend_info, guint timeout); +gboolean gmyth_scheduler_is_connected (GMythScheduler *scheduler); gboolean gmyth_scheduler_disconnect (GMythScheduler * scheduler); gint gmyth_scheduler_get_schedule_list (GMythScheduler * scheduler, GList ** sched_list); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |