Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-12-03 01:46:05 +01:00
commit d7bda9b640

View file

@ -77,7 +77,7 @@ public class VoiceRouter {
public interface VoiceMessageListener {
void onVoiceMessage();
}
private ConcurrentHashMap<VoiceMessageListener, Void> voiceMessageListeners;
private ConcurrentHashMap<VoiceMessageListener, Integer> voiceMessageListeners;
public VoiceRouter(RoutingHelper router, final OsmandSettings settings, CommandPlayer player) {
this.router = router;
@ -85,7 +85,7 @@ public class VoiceRouter {
this.settings = settings;
empty = new Struct("");
voiceMessageListeners = new ConcurrentHashMap<VoiceRouter.VoiceMessageListener, Void>();
voiceMessageListeners = new ConcurrentHashMap<VoiceRouter.VoiceMessageListener, Integer>();
}
public void setPlayer(CommandPlayer player) {
@ -842,7 +842,7 @@ public class VoiceRouter {
}
public void addVoiceMessageListener(VoiceMessageListener voiceMessageListener) {
voiceMessageListeners.put(voiceMessageListener, null);
voiceMessageListeners.put(voiceMessageListener, 0);
}
public void removeVoiceMessageListener(VoiceMessageListener voiceMessageListener) {