[asterisk-commits] rizzo: branch rizzo/video_v2 r84153 - /team/rizzo/video_v2/channels/chan_alsa.c

[SVN commits to the Asterisk project]

Author: rizzo
Date: Mon Oct  1 06:54:34 2007
New Revision: 84153

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84153
Log:
more compile fixes

Modified:
    team/rizzo/video_v2/channels/chan_alsa.c

Modified: team/rizzo/video_v2/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/video_v2/channels/chan_alsa.c?view=diff&rev=84153&r1=84152&r2=84153
==============================================================================
--- team/rizzo/video_v2/channels/chan_alsa.c (original)
+++ team/rizzo/video_v2/channels/chan_alsa.c Mon Oct  1 06:54:34 2007
@@ -163,13 +163,13 @@
 #endif
 	snd_pcm_t *icard, *ocard;
 
-	struct video_desc env;
+	struct video_desc *env;
 } alsa;
 
 static struct video_desc *get_video_desc(struct ast_channel *c)
 {
 	struct chan_alsa_pvt *o = c->tech_pvt;
-	return o ? &(o->env) : NULL;
+	return o ? o->env : NULL;
 }
 
 /* Number of buffers...  Each is FRAMESIZE/8 ms long.  For example
@@ -598,7 +598,7 @@
 	alsa.owner = NULL;
 	ast_verbose(" << Hangup on console >> \n");
 
-	console_video_uninit(&o->env);
+	console_video_uninit(o->env);
 
 	ast_module_unref(ast_module_info->self);
 	if (hookstate) {
@@ -1127,9 +1127,9 @@
 	for (; v; v = v->next) {
 		/* handle jb conf */
 		if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
-				continue;
-		if (!console_video_config(alsa.env, v->name, v->value))
-			return;
+			continue;
+		if (!console_video_config(&alsa.env, v->name, v->value))
+			continue;
 		if (!strcasecmp(v->name, "autoanswer"))
 			autoanswer = ast_true(v->value);
 		else if (!strcasecmp(v->name, "silencesuppression"))