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

#30 - WIP - adds Icecast TCP(v2.3) and HTTP(v2.4) server support. Adds streaming tab and ability to add/delete/change streaming configurations. Adds streaming channel alias id so that aliases can be tagged to stream to one or more stream channels. Adds initial support for broadcastify streaming.

Browse Source
This commit is contained in:
Denny
2016-11-06 09:33:49 -05:00
parent 893cbba277
commit 357979a5dd
85 changed files with 3418 additions and 2117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/alias/AliasList.java
View File

@@ -41,7 +41,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
public class AliasList implements Listener<AliasEvent>
{
@@ -120,7 +119,7 @@ public class AliasList implements Listener<AliasEvent>
mESN.put(esn, alias);
}
break;
case Fleetsync:
case FLEETSYNC:
String fleetsync = ((FleetsyncID)id).getIdent();
if(fleetsync != null)
@@ -134,7 +133,7 @@ public class AliasList implements Listener<AliasEvent>
mFleetsync.put(fleetsync, alias);
}
break;
case LoJack:
case LOJACK:
mLoJack.put((LoJackFunctionAndID) id, alias);
break;
case MDC1200:
@@ -179,10 +178,10 @@ public class AliasList implements Listener<AliasEvent>
mMobileID.put(min, alias);
}
break;
case LTRNetUID:
case LTR_NET_UID:
mUniqueID.put(((UniqueID)id).getUid(), alias);
break;
case Site:
case SITE:
String siteID = ((SiteID)id).getSite();
if(siteID != null)
@@ -196,10 +195,10 @@ public class AliasList implements Listener<AliasEvent>
mSiteID.put(siteID, alias);
}
break;
case Status:
case STATUS:
mStatus.put(((StatusID) id).getStatus(), alias);
break;
case Talkgroup:
case TALKGROUP:
String tgid = ((TalkgroupID)id).getTalkgroup();
if(tgid != null)
@@ -213,8 +212,8 @@ public class AliasList implements Listener<AliasEvent>
mTalkgroup.put(tgid, alias);
}
break;
case NonRecordable:
case Priority:
case NON_RECORDABLE:
case PRIORITY:
//We don't maintain lookups for these items
break;
default:
@@ -279,7 +278,7 @@ public class AliasList implements Listener<AliasEvent>
mESN.remove(esn);
break;
case Fleetsync:
case FLEETSYNC:
String fleetsync = ((FleetsyncID)id).getIdent();
if(fleetsync != null)
@@ -292,7 +291,7 @@ public class AliasList implements Listener<AliasEvent>
mFleetsync.remove(fleetsync);
}
break;
case LoJack:
case LOJACK:
mLoJack.remove((LoJackFunctionAndID) id);
break;
case MDC1200:
@@ -334,16 +333,16 @@ public class AliasList implements Listener<AliasEvent>
mMobileID.remove(min);
}
break;
case LTRNetUID:
case LTR_NET_UID:
mUniqueID.remove(((UniqueID) id).getUid());
break;
case Site:
case SITE:
mSiteID.remove(((SiteID) id).getSite());
break;
case Status:
case STATUS:
mStatus.remove(((StatusID) id).getStatus());
break;
case Talkgroup:
case TALKGROUP:
String tgid = ((TalkgroupID)id).getTalkgroup();
if(tgid != null)
@@ -356,8 +355,8 @@ public class AliasList implements Listener<AliasEvent>
mTalkgroup.remove(tgid);
}
break;
case NonRecordable:
case Priority:
case NON_RECORDABLE:
case PRIORITY:
//We don't maintain lookups for these items
break;
default: