Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions src/client.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,25 @@
#include "util.h"
#include "buffer.h"
#include "signalhandler.h"
#ifdef LLCON_VST_PLUGIN
# include "vstsound.h"

#if defined( _WIN32 ) && !defined( JACK_REPLACES_ASIO )
# include "../windows/sound.h"
#else
# if defined( _WIN32 ) && !defined( JACK_REPLACES_ASIO )
# include "../windows/sound.h"
# if ( defined( Q_OS_MACX ) ) && !defined( JACK_REPLACES_COREAUDIO )
# include "../mac/sound.h"
# else
# if ( defined( Q_OS_MACX ) ) && !defined( JACK_REPLACES_COREAUDIO )
# include "../mac/sound.h"
# if defined( Q_OS_IOS )
# include "../ios/sound.h"
# else
# if defined( Q_OS_IOS )
# include "../ios/sound.h"
# ifdef ANDROID
# include "../android/sound.h"
# else
# ifdef ANDROID
# include "../android/sound.h"
# else
# include "../linux/sound.h"
# ifndef JACK_REPLACES_ASIO // these headers are not available in Windows OS
# include <sched.h>
# include <netdb.h>
# endif
# include <socket.h>
# include "../linux/sound.h"
# ifndef JACK_REPLACES_ASIO // these headers are not available in Windows OS
# include <sched.h>
# include <netdb.h>
# endif
# include <socket.h>
# endif
# endif
Comment on lines +44 to 63
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This whole thing looks ugly. Isn't there anything like an else if construct?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style guide sayeth neigh.

# endif
Expand Down Expand Up @@ -272,11 +269,6 @@ class CClient : public QObject
CChannelCoreInfo ChannelInfo;
QString strClientName;

#ifdef LLCON_VST_PLUGIN
// VST version must have direct access to sound object
CSound* GetSound() { return &Sound; }
#endif

protected:
// callback function must be static, otherwise it does not work
static void AudioCallback ( CVector<short>& psData, void* arg );
Expand Down
112 changes: 0 additions & 112 deletions src/vstmain.cpp

This file was deleted.

68 changes: 0 additions & 68 deletions src/vstmain.h

This file was deleted.

60 changes: 0 additions & 60 deletions src/vstsound.h

This file was deleted.