GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

465 Wave Recording Audio Metadata (#473)

Browse Source 
* Initial work on updating wave audio metadata to use identifier collection.

* Cleanup
This commit is contained in:
Denny Sheirer
2018-12-31 06:01:59 -05:00
committed by GitHub
parent 3fa7401a2b
commit 08ea5ab7cb
2 changed files with 137 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/io/github/dsheirer/alias/AliasList.java
View File

@@ -402,7 +402,7 @@ public class AliasList implements Listener<AliasEvent>
while(it.hasNext())
{
if(it.next().getKey().equals(alias))
if(it.next().getValue().equals(alias))
{
it.remove();
}
@@ -416,7 +416,7 @@ public class AliasList implements Listener<AliasEvent>
public class TalkgroupAliasList
{
private Map<Integer,Alias> mTalkgroupAliasMap = new TreeMap<>();
private Map<TalkgroupRange, Alias> mTalkgroupRangeMap = new HashMap<>();
private Map<TalkgroupRange, Alias> mTalkgroupRangeAliasMap = new HashMap<>();
public TalkgroupAliasList()
{
@@ -431,11 +431,11 @@ public class AliasList implements Listener<AliasEvent>
return mTalkgroupAliasMap.get(value);
}
for(TalkgroupRange talkgroupRange: mTalkgroupRangeMap.keySet())
for(TalkgroupRange talkgroupRange: mTalkgroupRangeAliasMap.keySet())
{
if(talkgroupRange.contains(value))
{
return mTalkgroupRangeMap.get(talkgroupRange);
return mTalkgroupRangeAliasMap.get(talkgroupRange);
}
}
@@ -449,7 +449,7 @@ public class AliasList implements Listener<AliasEvent>
public void add(TalkgroupRange talkgroupRange, Alias alias)
{
mTalkgroupRangeMap.put(talkgroupRange, alias);
mTalkgroupRangeAliasMap.put(talkgroupRange, alias);
}
public void remove(Talkgroup talkgroup)
@@ -459,7 +459,7 @@ public class AliasList implements Listener<AliasEvent>
public void remove(TalkgroupRange talkgroupRange)
{
mTalkgroupRangeMap.remove(talkgroupRange);
mTalkgroupRangeAliasMap.remove(talkgroupRange);
}
/**
@@ -468,7 +468,7 @@ public class AliasList implements Listener<AliasEvent>
public void remove(Alias alias)
{
AliasList.remove(alias, mTalkgroupAliasMap);
AliasList.remove(alias, mTalkgroupRangeMap);
AliasList.remove(alias, mTalkgroupRangeAliasMap);
}
}
}