diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000..9a38daa Binary files /dev/null and b/src/.DS_Store differ diff --git a/src/Acid.Cam.v2.Qt b/src/Acid.Cam.v2.Qt deleted file mode 100755 index 343246d..0000000 Binary files a/src/Acid.Cam.v2.Qt and /dev/null differ diff --git a/src/main_window.cpp b/src/main_window.cpp index 62168ac..7cf5a73 100644 --- a/src/main_window.cpp +++ b/src/main_window.cpp @@ -215,8 +215,6 @@ AC_MainWindow::AC_MainWindow(QWidget *parent) : QMainWindow(parent) { disp = new DisplayWindow(this); playback = new Playback(); QObject::connect(playback, SIGNAL(procImage(QImage)), this, SLOT(updateFrame(QImage))); - QObject::connect(playback, SIGNAL(procCameraFrame(void *)), this, SLOT(CameraFrame(void *))); - } void AC_MainWindow::createControls() { @@ -790,7 +788,7 @@ void AC_MainWindow::updateFrame(QImage img) { frame_index++; QString 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); 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() { - QMessageBox::information(this, tr("About Acid Cam"), tr("Written by Jared Bruni

Social Media Accounts

\n\n GitHub
\nYouTube
Instagram
Facebook

\n")); + QMessageBox::information(this, tr("About Acid Cam"), tr("Written by Jared Bruni

Social Media Accounts

\n\n GitHub
\nYouTube
Instagram
FacebookTwitter


\n")); } diff --git a/src/main_window.h b/src/main_window.h index 976d42c..f39909f 100644 --- a/src/main_window.h +++ b/src/main_window.h @@ -84,7 +84,6 @@ public slots: void timer_Camera(); void timer_Video(); void updateFrame(QImage img); - void CameraFrame(void *frame); void chk_Clicked(); void cb_SetIndex(int index); private: