projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update Features5.pdf, fixes for awindowgui
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
channelinfo.C
diff --git
a/cinelerra-5.1/cinelerra/channelinfo.C
b/cinelerra-5.1/cinelerra/channelinfo.C
index 03d8d84261edb1d61799127a17e4eb4aa830a353..21e5049aab63f7e5ef45da2ce3f402952f717c48 100644
(file)
--- a/
cinelerra-5.1/cinelerra/channelinfo.C
+++ b/
cinelerra-5.1/cinelerra/channelinfo.C
@@
-1,3
+1,5
@@
+#ifdef HAVE_DVB
+
#include "asset.h"
#include "batch.h"
#include "bctimer.h"
#include "asset.h"
#include "batch.h"
#include "bctimer.h"
@@
-70,8
+72,8
@@
void ChanSearch::stop()
if( gui ) gui->set_done(1);
window_lock->unlock();
Thread::cancel();
if( gui ) gui->set_done(1);
window_lock->unlock();
Thread::cancel();
- Thread::join();
}
}
+ Thread::join();
}
void ChanSearch::run()
}
void ChanSearch::run()
@@
-560,8
+562,8
@@
void ChannelProgress::stop()
if( Thread::running() ) {
done = 1;
Thread::cancel();
if( Thread::running() ) {
done = 1;
Thread::cancel();
- Thread::join();
}
}
+ Thread::join();
}
void ChannelProgress::run()
}
void ChannelProgress::run()
@@
-1036,7
+1038,6
@@
int ChannelInfoFind::handle_event()
return 1;
}
return 1;
}
-
void ChannelThread::start()
{
if( !Thread::running() ) {
void ChannelThread::start()
{
if( !Thread::running() ) {
@@
-1050,8
+1051,8
@@
void ChannelThread::stop()
if( Thread::running() ) {
done = 1;
Thread::cancel();
if( Thread::running() ) {
done = 1;
Thread::cancel();
- Thread::join();
}
}
+ Thread::join();
}
ChannelThread::ChannelThread(ChannelInfoGUI *gui)
}
ChannelThread::ChannelThread(ChannelInfoGUI *gui)
@@
-1655,8
+1656,8
@@
void ChannelInfo::stop()
if( gui ) gui->stop(1);
window_lock->unlock();
Thread::cancel();
if( gui ) gui->stop(1);
window_lock->unlock();
Thread::cancel();
- Thread::join();
}
}
+ Thread::join();
}
void ChannelInfo::run()
}
void ChannelInfo::run()
@@
-1787,7
+1788,7
@@
void ChannelInfo::delete_batch()
}
ChannelScan::ChannelScan(MWindow *mwindow)
}
ChannelScan::ChannelScan(MWindow *mwindow)
- : BC_MenuItem(_("Scan"), _("Shift-S"), 'S')
+ : BC_MenuItem(_("Scan
...
"), _("Shift-S"), 'S')
{
set_shift();
this->mwindow = mwindow;
{
set_shift();
this->mwindow = mwindow;
@@
-1946,4
+1947,5
@@
int ChannelDeleteBatch::handle_event()
return RecordBatchesGUI::DeleteBatch::handle_event();
}
return RecordBatchesGUI::DeleteBatch::handle_event();
}
+#endif