diff options
author | Andreas Auras <yak54@gmx.net> | 2010-10-14 10:44:18 +0200 |
---|---|---|
committer | Andreas Auras <yak54@gmx.net> | 2010-10-14 10:44:18 +0200 |
commit | 68cb90228377499f2c4e70bb2e8dc71a219df983 (patch) | |
tree | aceac344d5e29af495bed30b244a626a1a0f4a21 | |
parent | 8d6f5a2c13ec1c964bc7eed9ac87906f0140e7a5 (diff) | |
download | xine-lib-atmolight-68cb90228377499f2c4e70bb2e8dc71a219df983.tar.gz xine-lib-atmolight-68cb90228377499f2c4e70bb2e8dc71a219df983.tar.bz2 |
Minor fixes, Prepare for version 0.7
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | xine_post_atmo.c | 24 |
2 files changed, 18 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index a2fbdd2..047204a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxine-atmo-plugin (0.7-0) lucid; urgency=low + + * New upstream release + + -- Andreas Auras <yak54@gmx.net> Thu, 14 Oct 2010 10:40:00 +0200 + libxine-atmo-plugin (0.6-0) karmic; urgency=low * New upstream release diff --git a/xine_post_atmo.c b/xine_post_atmo.c index 5df977d..45dde82 100644 --- a/xine_post_atmo.c +++ b/xine_post_atmo.c @@ -742,8 +742,8 @@ static void *atmo_grab_loop (void *this_gen) { pthread_mutex_lock(&this->lock); this->grab_running = &running; - pthread_mutex_unlock(&this->lock); pthread_cond_broadcast(&this->thread_started); + pthread_mutex_unlock(&this->lock); llprintf(LOG_1, "grab thread running\n"); @@ -1044,8 +1044,8 @@ static void *atmo_output_loop (void *this_gen) { pthread_mutex_lock(&this->lock); this->output_running = &running; - pthread_mutex_unlock(&this->lock); pthread_cond_broadcast(&this->thread_started); + pthread_mutex_unlock(&this->lock); llprintf(LOG_1, "output thread running\n"); @@ -1582,20 +1582,20 @@ static void atmo_class_dispose(post_class_t *class_gen) static void *atmo_init_plugin(xine_t *xine, void *data) { atmo_post_class_t *class = (atmo_post_class_t *) calloc(1, sizeof(atmo_post_class_t)); + if (!class) + return NULL; - if(class) { - class->xine = xine; - class->post_class.open_plugin = atmo_open_plugin; + class->xine = xine; + class->post_class.open_plugin = atmo_open_plugin; #if POST_PLUGIN_IFACE_VERSION < 10 - class->post_class.get_identifier = atmo_get_identifier; - class->post_class.get_description = atmo_get_description; - class->post_class.dispose = atmo_class_dispose; + class->post_class.get_identifier = atmo_get_identifier; + class->post_class.get_description = atmo_get_description; + class->post_class.dispose = atmo_class_dispose; #else - class->post_class.identifier = "atmo"; - class->post_class.description = N_("Analyze video picture and generate output data for atmolight controllers"); - class->post_class.dispose = default_post_class_dispose; + class->post_class.identifier = "atmo"; + class->post_class.description = N_("Analyze video picture and generate output data for atmolight controllers"); + class->post_class.dispose = default_post_class_dispose; #endif - } return &class->post_class; } |