Merge remote-tracking branch 'seife/master'

Origin commit data
------------------
Branch: master
Commit: 683aa6dfd2
Author: martii <m4rtii@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-03-25 18:16:40 +01:00

View File

@@ -178,12 +178,14 @@ bool cDemux::_open(void)
int flags = O_RDWR|O_CLOEXEC; int flags = O_RDWR|O_CLOEXEC;
int devnum = dmx_source[num]; int devnum = dmx_source[num];
if (last_source == devnum) { if (last_source == devnum) {
lt_info("%s #%d: source (%d) did not change\n", __func__, num, last_source); lt_debug("%s #%d: source (%d) did not change\n", __func__, num, last_source);
if (fd > -1) if (fd > -1)
return true; return true;
} }
if (fd > -1) { if (fd > -1) {
lt_info("%s #%d: FD ALREADY OPENED fd = %d lastsource %d devnum %d\n", __func__, num, fd, last_source, devnum); /* we changed source -> close and reopen the fd */
lt_debug("%s #%d: FD ALREADY OPENED fd = %d lastsource %d devnum %d\n",
__func__, num, fd, last_source, devnum);
close(fd); close(fd);
} }