eessppeelllloo/Acid.Cam.v2.Qt
1
0
Fork 0
mirror of https://github.com/lostjared/Acid.Cam.v2.Qt.git synced 2025-12-17 20:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed unused function, added closing ) to status bar text

Browse Source
This commit is contained in:
lostjared
2017-02-10 14:28:02 -08:00
parent ebb96f49f7
commit 68aae29a05
4 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/.DS_Store vendored Normal file
View File

Binary file not shown.

BIN
src/Acid.Cam.v2.Qt
View File

Binary file not shown.

9
src/main_window.cpp
View File

@@ -215,8 +215,6 @@ AC_MainWindow::AC_MainWindow(QWidget *parent) : QMainWindow(parent) {
disp = new DisplayWindow(this); disp = new DisplayWindow(this);
playback = new Playback(); playback = new Playback();
QObject::connect(playback, SIGNAL(procImage(QImage)), this, SLOT(updateFrame(QImage))); QObject::connect(playback, SIGNAL(procImage(QImage)), this, SLOT(updateFrame(QImage)));
QObject::connect(playback, SIGNAL(procCameraFrame(void *)), this, SLOT(CameraFrame(void *)));
} }
void AC_MainWindow::createControls() { void AC_MainWindow::createControls() {
@@ -790,7 +788,7 @@ void AC_MainWindow::updateFrame(QImage img) {
frame_index++; frame_index++;
QString frame_string; QString frame_string;
QTextStream frame_stream(&frame_string); QTextStream frame_stream(&frame_string);
frame_stream << "(Current/Total Frames/Seconds) - (" << frame_index << "/" << video_frames << "/" << (frame_index/video_fps); frame_stream << "(Current/Total Frames/Seconds) - (" << frame_index << "/" << video_frames << "/" << (frame_index/video_fps) << ") ";
statusBar()->showMessage(frame_string); statusBar()->showMessage(frame_string);
if(take_snapshot == true) { if(take_snapshot == true) {
@@ -814,10 +812,7 @@ void AC_MainWindow::updateFrame(QImage img) {
} }
} }
void AC_MainWindow::CameraFrame(void *frame) {
}
void AC_MainWindow::help_About() { void AC_MainWindow::help_About() {
QMessageBox::information(this, tr("About Acid Cam"), tr("Written by <b>Jared Bruni</b><br><br><b>Social Media Accounts</b><br><br>\n\n <a href=\"http://github.com/lostjared\">GitHub</a><br>\n<a href=\"http://youtube.com/lostjared\">YouTube</a><br><a href=\"http://instagram.com/lostjared\">Instagram</a><br><a href=\"http://facebook.com/LostSideDead0x\">Facebook</a><br><br>\n")); QMessageBox::information(this, tr("About Acid Cam"), tr("Written by <b>Jared Bruni</b><br><br><b>Social Media Accounts</b><br><br>\n\n <a href=\"http://github.com/lostjared\">GitHub</a><br>\n<a href=\"http://youtube.com/lostjared\">YouTube</a><br><a href=\"http://instagram.com/lostjared\">Instagram</a><br><a href=\"http://facebook.com/LostSideDead0x\">Facebook</a><a href=\"http://twitter.com/jaredbruni\">Twitter</a><br><br><br>\n"));
} }

1
src/main_window.h
View File

@@ -84,7 +84,6 @@ public slots:
void timer_Camera(); void timer_Camera();
void timer_Video(); void timer_Video();
void updateFrame(QImage img); void updateFrame(QImage img);
void CameraFrame(void *frame);
void chk_Clicked(); void chk_Clicked();
void cb_SetIndex(int index); void cb_SetIndex(int index);
private: private: