jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a comment and replace some class references

Browse Source 
Also, removed some unused headers, and moved the constructor/destructor
functions to the top
This commit is contained in:
jp9000 2014-02-02 15:23:38 -07:00
parent 8126ad0b69
commit 933549ca76
2 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libobs/obs.hpp
View File

@ -19,9 +19,6 @@
#pragma once
#include <string.h>
#include <stdarg.h>
#include "obs.h"
/* RAII wrappers */

94
obs/window-basic-main.cpp
View File

@ -33,6 +33,52 @@ using namespace std;
Q_DECLARE_METATYPE(OBSScene);
Q_DECLARE_METATYPE(OBSSceneItem);
OBSBasic::OBSBasic(QWidget *parent)
: OBSMainWindow (parent),
ui (new Ui::OBSBasic)
{
ui->setupUi(this);
}
void OBSBasic::OBSInit()
{
/* make sure it's fully displayed before doing any initialization */
show();
App()->processEvents();
if (!obs_startup())
throw "Failed to initialize libobs";
if (!InitGraphics())
throw "Failed to initialize graphics";
if (!InitAudio())
throw "Failed to initialize audio";
signal_handler_connect(obs_signalhandler(), "source-add",
OBSBasic::SourceAdded, this);
signal_handler_connect(obs_signalhandler(), "source-remove",
OBSBasic::SourceRemoved, this);
signal_handler_connect(obs_signalhandler(), "channel-change",
OBSBasic::ChannelChanged, this);
/* TODO: this is a test */
obs_load_module("test-input");
#ifdef _WIN32
/* HACK: fixes a windows qt bug with native widgets with native
* repaint */
ui->previewContainer->repaint();
#endif
}
OBSBasic::~OBSBasic()
{
/* free the lists before shutting down to remove the scene/item
* references */
ui->sources->clear();
ui->scenes->clear();
obs_shutdown();
}
OBSScene OBSBasic::GetCurrentScene()
{
QListWidgetItem *item = ui->scenes->currentItem();
@ -208,50 +254,6 @@ void OBSBasic::ChannelChanged(void *data, calldata_t params)
/* Main class functions */
OBSBasic::OBSBasic(QWidget *parent)
: OBSMainWindow (parent),
ui (new Ui::OBSBasic)
{
ui->setupUi(this);
}
void OBSBasic::OBSInit()
{
/* make sure it's fully displayed before doing any initialization */
show();
App()->processEvents();
if (!obs_startup())
throw "Failed to initialize libobs";
if (!InitGraphics())
throw "Failed to initialize graphics";
if (!InitAudio())
throw "Failed to initialize audio";
signal_handler_connect(obs_signalhandler(), "source-add",
OBSBasic::SourceAdded, this);
signal_handler_connect(obs_signalhandler(), "source-remove",
OBSBasic::SourceRemoved, this);
signal_handler_connect(obs_signalhandler(), "channel-change",
OBSBasic::ChannelChanged, this);
/* TODO: this is a test */
obs_load_module("test-input");
#ifdef _WIN32
/* HACK: fixes a windows qt bug with native widgets with native
* repaint */
ui->previewContainer->repaint();
#endif
}
OBSBasic::~OBSBasic()
{
ui->sources->clear();
ui->scenes->clear();
obs_shutdown();
}
bool OBSBasic::InitGraphics()
{
struct obs_video_info ovi;
@ -480,7 +482,7 @@ void OBSBasic::AddSource(obs_scene_t scene, const char *id)
void OBSBasic::AddSourcePopupMenu(const QPoint &pos)
{
obs_scene_t scene = GetCurrentScene();
OBSScene scene = GetCurrentScene();
const char *type;
bool foundValues = false;
size_t idx = 0;
@ -514,7 +516,7 @@ void OBSBasic::on_actionAddSource_triggered()
void OBSBasic::on_actionRemoveSource_triggered()
{
obs_sceneitem_t item = GetCurrentSceneItem();
OBSSceneItem item = GetCurrentSceneItem();
if (item)
obs_sceneitem_remove(item);
}