mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-27 23:42:43 +02:00
Merge branch 'mpx' of https://github.com/tuxbox-neutrino/library-stb-hal
Origin commit data
------------------
Branch: master
Commit: 9c7a5a3677
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-05-18 (Fri, 18 May 2018)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -323,6 +323,9 @@ cVideo::cVideo(int, void *, void *, unsigned int unit)
|
||||
|
||||
cVideo::~cVideo(void)
|
||||
{
|
||||
if (standby_cec_activ && fd >= 0)
|
||||
SetCECState(true);
|
||||
|
||||
closeDevice();
|
||||
}
|
||||
|
||||
@@ -345,10 +348,6 @@ retry:
|
||||
}
|
||||
lt_info("#%d: %s cannot open %s: %m, retries %d\n", devnum, __func__, VDEV[devnum], n);
|
||||
}
|
||||
if ( fd >= 0 && (ioctl(fd,VIDEO_SET_BLANK, false) < 0)){
|
||||
perror("VIDEO SET BLANK: ");
|
||||
}
|
||||
|
||||
playstate = VIDEO_STOPPED;
|
||||
}
|
||||
|
||||
@@ -357,12 +356,8 @@ void cVideo::closeDevice(void)
|
||||
lt_debug("%s\n", __func__);
|
||||
/* looks like sometimes close is unhappy about non-empty buffers */
|
||||
// Start();
|
||||
if (fd >= 0){
|
||||
if ((ioctl(fd,VIDEO_SET_BLANK, true) < 0)){
|
||||
perror("VIDEO SET BLANK: ");
|
||||
}
|
||||
if (fd >= 0)
|
||||
close(fd);
|
||||
}
|
||||
fd = -1;
|
||||
playstate = VIDEO_STOPPED;
|
||||
}
|
||||
|
Reference in New Issue
Block a user