comparison src/media.c @ 12034:bad5f83e7f22

[gaim-migrate @ 14327] whitespace cleanup in configure.ac, make sure HAVE_VV is #define'd if it's enabled and fix up some compile warnings in media.c now that #ifdef HAVE_VV actually has a chance of succeeding. /me thinks Sean must have been adding -DHAVE_VV to his CFLAGS to make this build at all before committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 10 Nov 2005 14:30:28 +0000
parents e67993da8a22
children 90d7e0f342fa
comparison
equal deleted inserted replaced
12033:053dcb5bc15b 12034:bad5f83e7f22
20 * 20 *
21 * You should have received a copy of the GNU General Public License 21 * You should have received a copy of the GNU General Public License
22 * along with this program; if not, write to the Free Software 22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 */ 24 */
25
26 #include "internal.h"
25 27
26 #ifdef HAVE_VV 28 #ifdef HAVE_VV
27 29
28 #include "media.h" 30 #include "media.h"
29 #include "mediastream.h" 31 #include "mediastream.h"
178 180
179 181
180 void gaim_voice_chat_set_state(GaimVoiceChat *vc, GaimMediaState state) 182 void gaim_voice_chat_set_state(GaimVoiceChat *vc, GaimMediaState state)
181 { 183 {
182 vc->state = state; 184 vc->state = state;
183 printf("State: %d\n",vc); 185 printf("State: %d\n",state);
184 if (media_ui_ops) 186 if (media_ui_ops)
185 media_ui_ops->state_change(vc, state); 187 media_ui_ops->state_change(vc, state);
186 } 188 }
187 189
188 void gaim_voice_chat_get_filters(GaimVoiceChat *vc, MSFilter **microphone, MSFilter **speaker) 190 void gaim_voice_chat_get_filters(GaimVoiceChat *vc, MSFilter **microphone, MSFilter **speaker)
194 MSSync *gaim_voice_chat_get_timer(GaimVoiceChat *vc) 196 MSSync *gaim_voice_chat_get_timer(GaimVoiceChat *vc)
195 { 197 {
196 return vc->timer; 198 return vc->timer;
197 } 199 }
198 200
199 void *gaim_voice_chat_start_streams(GaimVoiceChat *vc) 201 void gaim_voice_chat_start_streams(GaimVoiceChat *vc)
200 { 202 {
201 GaimConnection *gc = gaim_voice_chat_get_connection(vc); 203 GaimConnection *gc = gaim_voice_chat_get_connection(vc);
202 GaimPluginProtocolInfo *prpl_info = NULL; 204 GaimPluginProtocolInfo *prpl_info = NULL;
203 205
204 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); 206 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);