projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework proxy for 1:1 and new layout, fix proxy for resized assets, change track gang_...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
adeviceprefs.h
diff --git
a/cinelerra-5.1/cinelerra/adeviceprefs.h
b/cinelerra-5.1/cinelerra/adeviceprefs.h
index ebe5051ff20a69aca3490918a01620093c429a36..e7a480afbae229a434fd83b9dba0901cfd5136b0 100644
(file)
--- a/
cinelerra-5.1/cinelerra/adeviceprefs.h
+++ b/
cinelerra-5.1/cinelerra/adeviceprefs.h
@@
-26,17
+26,13
@@
class OSSEnable;
class ALSADevice;
class OSSEnable;
class ALSADevice;
+#include "adeviceprefs.inc"
#include "bitspopup.inc"
#include "guicast.h"
#include "playbackconfig.inc"
#include "preferencesthread.inc"
#include "recordconfig.inc"
#include "bitspopup.inc"
#include "guicast.h"
#include "playbackconfig.inc"
#include "preferencesthread.inc"
#include "recordconfig.inc"
-class ADriverMenu;
-class ADeviceTextBox;
-class ADeviceIntBox;
-class ADeviceTumbleBox;
-
class ADevicePrefs
{
public:
class ADevicePrefs
{
public:
@@
-74,6
+70,7
@@
private:
int create_cine_objs();
int create_dvb_objs();
int create_v4l2mpeg_objs();
int create_cine_objs();
int create_dvb_objs();
int create_v4l2mpeg_objs();
+ int create_pulse_objs();
int delete_oss_objs();
int delete_esound_objs();
int delete_oss_objs();
int delete_esound_objs();
@@
-81,6
+78,7
@@
private:
int delete_alsa_objs();
int delete_dvb_objs();
int delete_v4l2mpeg_objs();
int delete_alsa_objs();
int delete_dvb_objs();
int delete_v4l2mpeg_objs();
+ int delete_pulse_objs();
// The output config resolved from playback strategy and render engine.
AudioOutConfig *out_config;
// The output config resolved from playback strategy and render engine.
AudioOutConfig *out_config;
@@
-99,8
+97,8
@@
private:
OSSEnable *oss_enable[MAXDEVICES];
ADeviceTextBox *oss_path[MAXDEVICES];
BitsPopup *oss_bits;
OSSEnable *oss_enable[MAXDEVICES];
ADeviceTextBox *oss_path[MAXDEVICES];
BitsPopup *oss_bits;
- ADeviceTextBox *
esound_
server;
- ADeviceIntBox *
esound_
port;
+ ADeviceTextBox *server;
+ ADeviceIntBox *port;
ADeviceIntBox *firewire_port;
ADeviceIntBox *firewire_channel;
ADeviceTextBox *firewire_path;
ADeviceIntBox *firewire_port;
ADeviceIntBox *firewire_channel;
ADeviceTextBox *firewire_path;