fix: show correct display on startup with aoip output

martim01 · Jan 20, 2022 · 5563f73 · 5563f73
1 parent c6dfc0b
commit 5563f73
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 34 deletions.
diff --git a/documents/pam2.ini b/documents/pam2.ini
@@ -8,17 +8,11 @@ Speed=1
 Stereo=1
 Surround=0
 _Options=1
-[AoIP]
-Epoch=892122302
-NMOS_IS-04_A=NMOS:[v=0`o=- 1543226711 1543226711 IN IP4 172.29.80.65`s=Demo Audio Stream`t=0 0`m=audio 46848 RTP/AVP 102`c=IN IP4 232.130.55.188/32`a=source-filter: incl IN IP4 232.130.55.188 172.29.80.65`a=ts-refclk:ptp=IEEE1588-2008:ec-46-70-ff-fe-00-ce-de`a=rtpmap:102 L24/48000/2`a=mediaclk:direct=0`a=ptime:1`a=maxptime:1`]
-NMOS_IS-04_B=NMOS:[v=0`o=- 1543226711 1543226711 IN IP4 172.29.80.65`s=Demo Audio Stream`t=0 0`m=audio 46848 RTP/AVP 102`c=IN IP4 232.130.55.188/32`a=source-filter: incl IN IP4 232.130.55.188 172.29.80.65`a=ts-refclk:ptp=IEEE1588-2008:ec-46-70-ff-fe-00-ce-de`a=rtpmap:102 L24/48000/2`a=mediaclk:direct=0`a=ptime:1`a=maxptime:1`]
-Pam-25=sap:[v=0`o=- 1549268041496917 1 IN IP4 127.0.1.1`s=Description`i=Info`t=0 0`a=tool:LIVE555 Streaming Media v2018.09.18`a=type:broadcast`a=control:*`a=source-filter: incl IN IP4 * 127.0.1.1`a=rtcp-unicast: reflection`a=range:npt=0-`a=x-qt-text-nam:Description`a=x-qt-text-inf:Info`m=audio 5004 RTP/AVP 96`c=IN IP4 239.113.163.29/255`b=AS:50`a=rtpmap:96 L24/48000/2`a=ptime:4000`a=maxptime:4000`a=ts-refclk:`a=mediaclk:direct=483335823`a=control:track1]
-Test=rtsp://10.10.11.5:5555/PAM
 [Discovery]
 NMOS=0
-RTSP=0
+RTSP=1
 SAP=1
-SIP=1
+SIP=0
 [FFT]
 Bins=3
 Cursor=0
@@ -31,17 +25,13 @@ _Options=5
 [General]
 Cursor=1
 Pin=0
-Pin_Value=1065
 ShowOptions=0
-Version=1.0.615.3525
 [Generator]
 Amplitude=-18.0
-Frequency=724
+Frequency=1000
 Shape=0
 [Input]
-AoIP=NMOS_IS-04_B
 Device=0
-Disabled=NMOS_IS-04_B
 Type=Disabled
 [Lissajou]
 Axis_X=0
@@ -56,8 +46,8 @@ _Options=2
 [Log]
 ScrollLock=0
 [Main]
-Last=Tests
-Monitor=Settings
+Last=Meters
+Monitor=Meters
 [Meters]
 M3M6=1
 Mode=Digital
@@ -83,19 +73,17 @@ Source=1
 Activate=0
 Client=0
 Connection_05=1
-IS-04=NMOS:[v=0`o=- 1548144358 1548144358IN IP 4 192.168.1.53`t=0 0 `s=raspberry:raspberry`m=audio 5004 RTP/AVP 96`a=rtpmap:96 L24/48000/2`a=ptime:0.125`a=mediaclk:direct=129122110`ts-refclk:localmac=00-00-FFFFFFC0-FFFFFFA8-01-35`]
 [Noise]
 Amplitude=-13.8
 Colour=0
 [Output]
 Destination=AoIP
 Device=0
 Enabled=0
-File=radio3
 Latency=200
 Left=0
 Right=1
-Sequence=GLITS
+Sequence=glits
 Source=Sequence
 [Polar Scope]
 Mode=0
@@ -118,11 +106,6 @@ RefreshRate=100
 Routing=0
 Timeframe=30
 _Options=1
-[SDP]
-rtsp://10.10.11.200/by-name/WIRE_2001@IFR-RD=v=0`o=- 1 1 IN IP4 10.10.11.200`s=Channel 13001`t=0 0`a=clock-domain:PTPv2 0`a=type:multicast`m=audio 5004 RTP/AVP 96`c=IN IP4 239.192.50.201`a=rtpmap:96 L24/48000/2`a=sync-time:0`
-rtsp://10.10.11.200/by-name/WIRE_2002@IFR-RD=v=0`o=- 2 1 IN IP4 10.10.11.200`s=Channel 2`t=0 0`a=clock-domain:PTPv2 0`a=type:unicast`m=audio 16384 RTP/AVP 96`c=IN IP4 10.10.11.200`a=rtpmap:96 L24/48000/2`a=sync-time:0`
-rtsp://10.10.11.200/by-name/WIRE_2003@IFR-RD=v=0`o=- 3 1 IN IP4 10.10.11.200`s=Channel 13003`t=0 0`a=clock-domain:PTPv2 0`a=type:multicast`m=audio 5004 RTP/AVP 96`c=IN IP4 239.192.50.203`a=rtpmap:96 L24/48000/2`a=sync-time:0`
-rtsp://10.10.11.200/by-name/WIRE_2004@IFR-RD=v=0`o=- 4 1 IN IP4 10.10.11.200`s=Channel 13004`t=0 0`a=clock-domain:PTPv2 0`a=type:multicast`m=audio 5004 RTP/AVP 96`c=IN IP4 239.192.50.204`a=rtpmap:96 L24/48000/2`a=sync-time:0`
 [Scope]
 Autotrigger=1
 Mode=0
@@ -135,8 +118,9 @@ DestinationIp=239.34.13.86
 Multicast=239.56.138.33
 PacketTime=333
 RTP_Port=5004
-RTSP_Address=192.168.1.98
-Stream=0
+RTSP_Address=192.168.1.123
+RTSP_Interface=eth0
+Stream=Multicast
 [Session Info]
 Graph=kBit/s
 _Options=0
@@ -176,9 +160,3 @@ Range=19.4
 Log=0
 LogView=0
 _Panel=3
-[Update]
-Type=USB
-USB=sda1
-[Version]
-pam2=1.0.1142.6396
-pamupdatemanager=1.0.26.127
diff --git a/pam2/CMakeLists.txt b/pam2/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-project(pam2 LANGUAGES CXX VERSION 1.3.0.0)
+project(pam2 LANGUAGES CXX VERSION 1.3.1)
 
 execute_process(COMMAND ${CMAKE_COMMAND} -DNAMESPACE=${PROJECT_NAME} -DMAJOR=${PROJECT_VERSION_MAJOR} -DMINOR=${PROJECT_VERSION_MINOR} -DPATCH=${PROJECT_VERSION_PATCH} -P ${CMAKE_SOURCE_DIR}/version.cmake)
 

diff --git a/pam2/pnlSettingsOutput.cpp b/pam2/pnlSettingsOutput.cpp
@@ -237,7 +237,7 @@ pnlSettingsOutput::pnlSettingsOutput(wxWindow* parent,wxWindowID id,const wxPoin
 
 
     m_plstPlayback->Disable();
-    m_pbtnStream->ToggleSelection(false);
+    //m_pbtnStream->ToggleSelection(false);
 
     Settings::Get().AddHandler(wxT("Server"), wxT("RTP_Port"), this);
     Settings::Get().AddHandler(wxT("Server"), wxT("RTSP_Port"), this);
@@ -282,7 +282,6 @@ void pnlSettingsOutput::UpdateDisplayedSettings()
     m_pbtnChannels->SetLabel(Settings::Get().Read("Server", "Channels", "2"));
 
     m_pbtnSAP->Show(bMulticast);
-
     m_pLbl1->Show(bMulticast);
     m_ppnlAddress->Show(bMulticast);
 
@@ -324,6 +323,8 @@ void pnlSettingsOutput::OnSettingChanged(SettingEvent& event)
             bool bMulticast(Settings::Get().Read(wxT("Server"), wxT("Stream"), "Unicast") == "Multicast");
             m_pbtnStream->ToggleSelection(bMulticast);
             m_pbtnSAP->Show(bMulticast);
+            m_pLbl1->Show(bMulticast);
+            m_ppnlAddress->Show(bMulticast);
         }
         else if(event.GetKey() == wxT("DNS-SD"))
         {