Changeset 1000

User picture

Author: Eric Maupin

(2010/08/29 18:56) Over 1 year ago

 * Fixed #148 (AudioSourceStateChanged triggering music volume adjust in different channels)

Affected files

Updated branches/0.12.2/src/Gablarski.Clients/Music/MediaController.cs Download diff

9991000
191
191



192
		private void OnAudioSourceStarted (object sender, AudioSourceEventArgs e)
192
		private void OnAudioSourceStarted (object sender, AudioSourceEventArgs e)



193
		{
193
		{



194
			if (!UserTalkingCounts && e.Source.OwnerId == context.CurrentUser.UserId)
194
			if ((!UserTalkingCounts && e.Source.OwnerId == context.CurrentUser.UserId) 



195
				|| this.context.Users[e.Source.OwnerId].CurrentChannelId != this.context.CurrentUser.CurrentChannelId)



196
			{



195
				return;
197
				return;



198
			}



196
199



197
			AddTalker (e.Source);
200
			AddTalker (e.Source);



198
		}
201
		}





          

  Updated
trunk/src/Gablarski.Clients/Music/MediaController.cs  Download diff




      
      
9991000
209
209



210
		private void OnAudioSourceStarted (object sender, AudioSourceEventArgs e)
210
		private void OnAudioSourceStarted (object sender, AudioSourceEventArgs e)



211
		{
211
		{



212
			if (!UserTalkingCounts && e.Source.OwnerId == context.CurrentUser.UserId)
212
			if ((!UserTalkingCounts && e.Source.OwnerId == context.CurrentUser.UserId) 



213
				|| this.context.Users[e.Source.OwnerId].CurrentChannelId != this.context.CurrentUser.CurrentChannelId)



214
			{



213
				return;
215
				return;



216
			}



214
217



215
			AddTalker (e.Source);
218
			AddTalker (e.Source);



216
		}
219
		}