From 71c713dce2b5128862b293aa7fcc1d7ee89ffaf1 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Tue, 10 Jan 2006 11:24:31 +0000
Subject: *** empty log message ***
---
src/Makefile.am | 4 ++--
src/cprlisten.cc | 10 +++++-----
src/mainwindow.cc | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 441750d..69923f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ miav_SOURCES = $(shell if [ $QT_CXXFLAGS ] ; then ../tools/MocList cc; fi ) \
threadsafe_queue.cc \
threadsafe_queue_fifo.cc \
threadsafe_queue_priority.cc \
- transmitter.cc \
+ encoder.cc \
util.cc \
videowidget.cc \
yuv_draw.cc
@@ -109,7 +109,7 @@ EXTRA_DIST = \
threadsafe_queue.h \
threadsafe_queue_fifo.h \
threadsafe_queue_priority.h \
- transmitter.h \
+ encoder.h \
util.h \
videowidget.h \
yuv_draw.h
diff --git a/src/cprlisten.cc b/src/cprlisten.cc
index 62deede..0a4958e 100644
--- a/src/cprlisten.cc
+++ b/src/cprlisten.cc
@@ -55,13 +55,13 @@ void CPRListen::stop()
socket.connect("localhost", port);
socket.send_string(MAGIC_STOP_STRING);
} catch(Network_error &e) {
- info.error("In stop(): %s.", e.error.c_str());
+ info->error("In stop(): %s.", e.error.c_str());
}
}
void CPRListen::thread_main()
{
- info.info("Listening for CPRs.");
+ info->log("Listening for CPRs.");
while(running) {
try {
string newcpr;
@@ -76,15 +76,15 @@ void CPRListen::thread_main()
cprchanged = true;
cpr = newcpr;
mutex.unlock();
- info.info("Got CPR: %s.", cpr.c_str());
+ info->log("Got CPR: %s.", cpr.c_str());
}
} catch(Network_error &e) {
- info.error("In thread_main(): %s.", e.error.c_str());
+ info->error("In thread_main(): %s.", e.error.c_str());
running = false;
}
}
- info.info("Stopped listening for CPRs.");
+ info->log("Stopped listening for CPRs.");
}
bool CPRListen::cprChanged()
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index 5e64a75..ce3d9bb 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -453,7 +453,7 @@ void MainWindow::cpr_clicked()
clear();
// Create and call the CPRQueryDialog.
- CPRQueryDialog dlg(lbl_cpr, lbl_name, this, TXT_CPRDLG_TITLE, status);
+ CPRQueryDialog dlg(info, lbl_cpr, lbl_name, this, TXT_CPRDLG_TITLE, status);
if(dlg.exec() == 0) {
// Restore old CPR and name, in the labels.
--
cgit v1.2.3