mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-20 13:08:50 +02:00
f2ee950746
- Fix a bug where the initial audio data insertion would cause all audio data to unintentionally clear (mixed up < and > operators, damn human error) - Fixed a potential interdependant lock scenario with channel mutex locks and graphics mutex locks. The main video thread could lock the graphics mutex and then while in the graphics mutex could lock the channels mutex. Meanwhile in another thread, the channel mutex could get locked, and then the graphics mutex would get locked, causing a deadlock. The best way to deal with this is to not let mutexes lock within other mutexes, but sometimes it's difficult to avoid such as in the main video thread. - Audio devices should now be functional, and the devices in the audio settings can now be changed as desired.
71 lines
2.0 KiB
C++
71 lines
2.0 KiB
C++
/******************************************************************************
|
|
Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
******************************************************************************/
|
|
|
|
#pragma once
|
|
|
|
#include <QApplication>
|
|
#include <util/util.hpp>
|
|
#include <string>
|
|
#include <memory>
|
|
|
|
#include "window-main.hpp"
|
|
|
|
class OBSApp : public QApplication {
|
|
Q_OBJECT
|
|
|
|
private:
|
|
std::string locale;
|
|
ConfigFile globalConfig;
|
|
TextLookup textLookup;
|
|
std::unique_ptr<OBSMainWindow> mainWindow;
|
|
|
|
bool InitGlobalConfig();
|
|
bool InitGlobalConfigDefaults();
|
|
bool InitLocale();
|
|
|
|
public:
|
|
OBSApp(int &argc, char **argv);
|
|
|
|
void OBSInit();
|
|
|
|
inline QMainWindow *GetMainWindow() const {return mainWindow.get();}
|
|
|
|
inline config_t GlobalConfig() const {return globalConfig;}
|
|
|
|
inline const char *GetLocale() const
|
|
{
|
|
return locale.c_str();
|
|
}
|
|
|
|
inline const char *GetString(const char *lookupVal) const
|
|
{
|
|
return textLookup.GetString(lookupVal);
|
|
}
|
|
|
|
const char *InputAudioSource() const;
|
|
const char *OutputAudioSource() const;
|
|
|
|
const char *GetRenderModule() const;
|
|
};
|
|
|
|
inline OBSApp *App() {return static_cast<OBSApp*>(qApp);}
|
|
|
|
inline config_t GetGlobalConfig() {return App()->GlobalConfig();}
|
|
|
|
inline const char *Str(const char *lookup) {return App()->GetString(lookup);}
|
|
#define QTStr(lookupVal) QString::fromUtf8(Str(lookupVal))
|