mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit: align to ddt

Browse Source 
Origin commit data
------------------
Commit: 32c2ff6b54
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-12-19 (Thu, 19 Dec 2019)

Origin message was:
------------------
- zapit: align to ddt
This commit is contained in:
vanhofen
2019-12-19 23:31:35 +01:00
parent c143faa9d3
commit 337721a8b1
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/zapit/src/frontend.cpp
View File

@@ -2337,9 +2337,7 @@ double calcAzimuth(double SatLon, double SiteLat, double SiteLon, int Height_ove
double calcDeclination(double SiteLat, double Azimuth, double Elevation) double calcDeclination(double SiteLat, double Azimuth, double Elevation)
{ {
return Deg(ASIN(SIN(Radians(Elevation)) * SIN(Radians(SiteLat)) + COS(Radians(Elevation)) * COS(Radians(SiteLat)) + COS(Radians(Azimuth)) return Deg(ASIN(SIN(Radians(Elevation)) * SIN(Radians(SiteLat)) + COS(Radians(Elevation)) * COS(Radians(SiteLat)) + COS(Radians(Azimuth))));
)
);
} }
double calcSatHourangle(double Azimuth, double Elevation, double Declination, double Lat) double calcSatHourangle(double Azimuth, double Elevation, double Declination, double Lat)

4
src/zapit/src/zapit.cpp
View File

@@ -857,7 +857,7 @@ void CZapit::SetPidVolume(t_channel_id channel_id, int pid, int percent)
if (!channel_id) if (!channel_id)
channel_id = live_channel_id; channel_id = live_channel_id;
if (!pid && (channel_id == live_channel_id) && current_channel) if ((pid < 0) && (channel_id == live_channel_id) && current_channel)
pid = current_channel->getAudioPid(); pid = current_channel->getAudioPid();
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(vol_map_mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(vol_map_mutex);
INFO("############################### channel %" PRIx64 " pid %x map size %d percent %d", channel_id, pid, (int)vol_map.size(), percent); INFO("############################### channel %" PRIx64 " pid %x map size %d percent %d", channel_id, pid, (int)vol_map.size(), percent);
@@ -879,7 +879,7 @@ int CZapit::GetPidVolume(t_channel_id channel_id, int pid, bool ac3)
if (!channel_id) if (!channel_id)
channel_id = live_channel_id; channel_id = live_channel_id;
if (!pid && (channel_id == live_channel_id) && current_channel) if ((pid < 0) && (channel_id == live_channel_id) && current_channel)
pid = current_channel->getAudioPid(); pid = current_channel->getAudioPid();
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(vol_map_mutex); OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(vol_map_mutex);