Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixes to previous commit as suggested by perexg
  • Loading branch information
Gary The Brown authored and perexg committed Aug 4, 2014
1 parent 11b2136 commit 70e650f
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions src/input/mpegts/linuxdvb/linuxdvb_rotor.c
Expand Up @@ -133,15 +133,11 @@ static int
linuxdvb_rotor_grace
( linuxdvb_diseqc_t *ld, dvb_mux_t *lm )
{
if (ld->ld_satconf->lse_parent->ls_orbital_pos == 0)
{
if (lr->lr_rate != 0)
return (120 * 500 + 999)/1000;
else
return 120;
}
linuxdvb_rotor_t *lr = (linuxdvb_rotor_t*)ld;

if (ld->ld_satconf->lse_parent->ls_orbital_pos == 0 || lr->lr_rate != 0)
return 120;

int curpos = ld->ld_satconf->lse_parent->ls_orbital_pos;

if (ld->ld_satconf->lse_parent->ls_orbital_dir == 'W')
Expand Down Expand Up @@ -192,8 +188,7 @@ linuxdvb_rotor_gotox_tune

tvhdebug("diseqc", "rotor GOTOX pos %d sent", lr->lr_position);

linuxdvb_diseqc_t *ld = (linuxdvb_diseqc_t*)lr;
return linuxdvb_rotor_grace(ld,lm);
return linuxdvb_rotor_grace((linuxdvb_diseqc_t*)lr,lm);
}

/* USALS */
Expand Down Expand Up @@ -263,8 +258,7 @@ linuxdvb_rotor_usals_tune
usleep(25000);
}

linuxdvb_diseqc_t *ld = (linuxdvb_diseqc_t*)lr;
return linuxdvb_rotor_grace(ld,lm);
return linuxdvb_rotor_grace((linuxdvb_diseqc_t*)lr,lm);

#undef TO_RAD
#undef TO_DEG
Expand Down

0 comments on commit 70e650f

Please sign in to comment.