supernova: replace NULL by nullptr

typesafety is nice

Author: timblechmann

server/supernova/audio_backend/jack_backend.hpp

@@ -53,7 +53,7 @@ class jack_backend:
 
 public:
     jack_backend(void):
-        client(NULL), is_active(false), time_is_synced(false)
+        client(nullptr), is_active(false), time_is_synced(false)
     {}
 
     ~jack_backend(void)
@@ -93,7 +93,7 @@ class jack_backend:
         jack_set_thread_init_callback (client, jack_thread_init_callback, this);
         jack_set_process_callback (client, jack_process_callback, this);
         jack_set_xrun_callback(client, jack_xrun_callback, this);
-        jack_on_info_shutdown(client, (JackInfoShutdownCallback)jack_on_info_shutdown_callback, NULL);
+        jack_on_info_shutdown(client, (JackInfoShutdownCallback)jack_on_info_shutdown_callback, nullptr);
 
         /* register ports */
         input_ports.clear();
@@ -129,13 +129,13 @@ class jack_backend:
     {
         if (client) {
             jack_client_close(client);
-            client = NULL;
+            client = nullptr;
         }
     }
 
     bool audio_is_opened(void)
     {
-        return client != NULL;
+        return client != nullptr;
     }
 
     bool audio_is_active(void)
@@ -178,7 +178,7 @@ class jack_backend:
 
     int connect_all_inputs(const char * client_name)
     {
-        const char **ports = jack_get_ports (client, client_name, NULL, JackPortIsOutput);
+        const char **ports = jack_get_ports (client, client_name, nullptr, JackPortIsOutput);
 
         if (!ports)
             return -1;
@@ -200,7 +200,7 @@ class jack_backend:
 
     int connect_all_outputs(const char * client_name)
     {
-        const char **ports = jack_get_ports (client, client_name, NULL, JackPortIsInput);
+        const char **ports = jack_get_ports (client, client_name, nullptr, JackPortIsInput);
 
         if (!ports)
             return -1;

server/supernova/audio_backend/portaudio_backend.hpp

@@ -49,7 +49,7 @@ class portaudio_backend:
 
 public:
     portaudio_backend(void):
-        stream(NULL), blocksize_(0)
+        stream(nullptr), blocksize_(0)
     {
         int err = Pa_Initialize();
         report_error(err, true);
@@ -168,7 +168,7 @@ class portaudio_backend:
             in_parameters.channelCount = inchans;
             in_parameters.sampleFormat = paFloat32 | paNonInterleaved;
             in_parameters.suggestedLatency = suggestedLatencyIn;
-            in_parameters.hostApiSpecificStreamInfo = NULL;
+            in_parameters.hostApiSpecificStreamInfo = nullptr;
         }
 
         if (outchans) {
@@ -180,11 +180,11 @@ class portaudio_backend:
             out_parameters.channelCount = outchans;
             out_parameters.sampleFormat = paFloat32 | paNonInterleaved;
             out_parameters.suggestedLatency = suggestedLatencyOut;
-            out_parameters.hostApiSpecificStreamInfo = NULL;
+            out_parameters.hostApiSpecificStreamInfo = nullptr;
         }
 
-        PaStreamParameters * in_stream_parameters  = inchans ? &in_parameters : NULL;
-        PaStreamParameters * out_stream_parameters = outchans ? &out_parameters : NULL;
+        PaStreamParameters * in_stream_parameters  = inchans ? &in_parameters : nullptr;
+        PaStreamParameters * out_stream_parameters = outchans ? &out_parameters : nullptr;
 
         PaError supported = Pa_IsFormatSupported(in_stream_parameters, out_stream_parameters, samplerate);
         report_error(supported);
@@ -213,14 +213,14 @@ class portaudio_backend:
 
     void close_stream(void)
     {
-        if (stream == NULL)
+        if (stream == nullptr)
             return;
 
         deactivate_audio();
 
         int err = Pa_CloseStream(stream);
         report_error(err);
-        stream = NULL;
+        stream = nullptr;
     }
 
     void activate_audio()

server/supernova/audio_backend/sndfile_backend.hpp

@@ -101,7 +101,7 @@ class sndfile_backend:
         if (!output_file)
             throw std::runtime_error("cannot open output file");
 
-        output_file.command(SFC_SET_CLIPPING, NULL, SF_TRUE);
+        output_file.command(SFC_SET_CLIPPING, nullptr, SF_TRUE);
 
         super::output_samples.resize(output_channel_count);
 

server/supernova/dsp_thread_queue/dsp_thread.hpp

@@ -65,11 +65,11 @@ class dsp_thread:
 public:
     dsp_thread(dsp_queue_interpreter & interpreter, uint16_t index, size_t stack_size,
                thread_init_functor const & thread_init = thread_init_functor()):
-        thread_init_functor(thread_init), interpreter(interpreter), stop(false), index(index), stack_ (NULL)
+        thread_init_functor(thread_init), interpreter(interpreter), stop(false), index(index), stack_ (nullptr)
     {
         if (stack_size) {
                 stack_ = malloc_aligned<char>(stack_size);
-            if (stack_ == NULL)
+            if (stack_ == nullptr)
                 throw std::bad_alloc();
             // touch stack to avoid page faults
             for (size_t i = 0; i != stack_size; ++i)
@@ -106,7 +106,7 @@ class dsp_thread:
     {
         dsp_thread * self = static_cast<dsp_thread*>(arg);
         self->run();
-        return NULL;
+        return nullptr;
     }
 
     void terminate(void)

server/supernova/dsp_thread_queue/dsp_thread_queue.hpp

@@ -194,7 +194,7 @@ class dsp_thread_queue_item:
         std::size_t i = 0;
         for (;;) {
             if (i == successors.size())
-                return NULL;
+                return nullptr;
 
             ptr = successors[i++]->dec_activation_count(interpreter);
             if (ptr)
@@ -220,7 +220,7 @@ class dsp_thread_queue_item:
         if (current == 1)
             return this;
         else
-            return NULL;
+            return nullptr;
     }
 
     std::atomic<activation_limit_t> activation_count; /**< current activation count */
@@ -355,7 +355,7 @@ class dsp_queue_interpreter
      */
     bool init_tick(void)
     {
-        if (unlikely((queue.get() == NULL) or                /* no queue */
+        if (unlikely((queue.get() == nullptr) or                /* no queue */
                      (queue->get_total_node_count() == 0)    /* no nodes */
                     ))
             return false;
@@ -584,7 +584,7 @@ class dsp_queue_interpreter
         do {
             item = item->run(*this, index);
             consumed += 1;
-        } while (item != NULL);
+        } while (item != nullptr);
 
         node_count_t remaining = node_count.fetch_sub(consumed, std::memory_order_release);
 

server/supernova/sc/sc_osc_handler.cpp

@@ -49,7 +49,7 @@ server_node * find_node(int32_t target_id)
 
     server_node * node = instance->find_node(target_id);
 
-    if (node == NULL)
+    if (node == nullptr)
         log_printf("node not found: %d\n", target_id);
 
     return node;
@@ -62,7 +62,7 @@ abstract_group * find_group(int32_t target_id)
 
     abstract_group * node = instance->find_group(target_id);
 
-    if (node == NULL)
+    if (node == nullptr)
         log("node not found or not a group\n");
     return node;
 }
@@ -143,7 +143,7 @@ struct movable_string
     movable_string(movable_string const & rhs)
     {
         data_ = rhs.data_;
-        const_cast<movable_string&>(rhs).data_ = NULL;
+        const_cast<movable_string&>(rhs).data_ = nullptr;
     }
 
     ~movable_string(void)
@@ -178,7 +178,7 @@ struct movable_array
     {
         length_ = rhs.length_;
         data_ = rhs.data_;
-        const_cast<movable_array&>(rhs).data_ = NULL;
+        const_cast<movable_array&>(rhs).data_ = nullptr;
     }
 
     ~movable_array(void)
@@ -1066,12 +1066,12 @@ sc_synth * add_synth(const char * name, int node_id, int action, int target_id)
         return 0;
 
     server_node * target = find_node(target_id);
-    if (target == NULL)
-        return NULL;
+    if (target == nullptr)
+        return nullptr;
 
     node_position_constraint pos = make_pair(target, node_position(action));
     if (!node_position_sanity_check(pos))
-        return NULL;
+        return nullptr;
 
     abstract_synth * synth = instance->add_synth(name, node_id, pos);
     if (!synth)
@@ -1214,7 +1214,7 @@ void handle_s_new(received_message const & msg)
 
     sc_synth * synth = add_synth(def_name, id, action, target);
 
-    if (synth == NULL)
+    if (synth == nullptr)
         return;
 
     try {
@@ -1732,7 +1732,7 @@ void handle_n_order(received_message const & msg)
 
     server_node * target = find_node(target_id);
 
-    if (target == NULL)
+    if (target == nullptr)
         return;
 
     abstract_group * target_parent;
@@ -1749,7 +1749,7 @@ void handle_n_order(received_message const & msg)
         args >> node_id;
 
         server_node * node = find_node(node_id);
-        if (node == NULL)
+        if (node == nullptr)
             continue;
 
         abstract_group * node_parent = node->get_parent();
@@ -3164,7 +3164,7 @@ void handle_u_cmd(received_message const & msg, int size)
 
     server_node * target_synth = find_node(node_id);
 
-    if (target_synth == NULL || target_synth->is_group())
+    if (target_synth == nullptr || target_synth->is_group())
         return;
 
     sc_synth * synth = static_cast<sc_synth*>(target_synth);

server/supernova/sc/sc_plugin_interface.cpp

@@ -60,8 +60,8 @@ spin_lock rt_pool_guard;
 
 inline Node * as_Node(server_node * node)
 {
-    if (node == NULL)
-        return NULL;
+    if (node == nullptr)
+        return nullptr;
 
     // hack!!! we only assume that the 32bit integer mID member can be accessed via Node
     if (node->is_synth()) {
@@ -368,7 +368,7 @@ void * rt_alloc(World * dummy, size_t size)
     if (size)
         return nova::rt_pool.malloc(size);
     else
-        return NULL;
+        return nullptr;
 }
 
 void * rt_realloc(World * dummy, void * ptr, size_t size)
@@ -647,7 +647,7 @@ void sc_plugin_interface::initialize(server_arguments const & args, float * cont
 
     /* sndfile functions */
 #ifdef NO_LIBSNDFILE
-    sc_interface.fSndFileFormatInfoFromStrings = NULL;
+    sc_interface.fSndFileFormatInfoFromStrings = nullptr;
 #else
     sc_interface.fSndFileFormatInfoFromStrings = &sndfileFormatInfoFromStrings;
 #endif
@@ -906,7 +906,7 @@ void sc_plugin_interface::allocate_buffer(SndBuf * buf, uint32_t frames, uint32_
 		throw std::runtime_error( "invalid buffer size" );
 
     sample * data = nova::allocate_buffer(samples);
-    if (data == NULL)
+    if (data == nullptr)
 		throw std::runtime_error( "could not allocate memory" );
 
     buf->data       = data;
@@ -1076,10 +1076,10 @@ void sc_plugin_interface::buffer_close(uint32_t index)
 {
     SndBuf * buf = World_GetNRTBuf(&world, index);
 
-    if (buf->sndfile == NULL)
+    if (buf->sndfile == nullptr)
         return;
     sf_close(buf->sndfile);
-    buf->sndfile = NULL;
+    buf->sndfile = nullptr;
 }
 
 

server/supernova/sc/sc_synth.cpp

@@ -62,7 +62,7 @@ sc_synth::sc_synth(int node_id, sc_synth_definition_ptr const & prototype):
     char * raw_chunk = rt_synthesis ? (char*)rt_pool.malloc(total_alloc_size)
                                     : (char*)malloc(total_alloc_size);
 
-    if (raw_chunk == NULL)
+    if (raw_chunk == nullptr)
         throw std::bad_alloc();
 
     linear_allocator allocator(raw_chunk);

server/supernova/sc/sc_synthdef.cpp

@@ -342,7 +342,7 @@ void sc_synthdef::prepare(void)
         current_ugen_spec.buffer_mapping.resize(current_ugen_spec.output_specs.size());
 
         sc_ugen_def * ugen = sc_factory->find_ugen(current_ugen_spec.name);
-        if (unlikely(ugen == NULL)) {
+        if (unlikely(ugen == nullptr)) {
             /* we cannot prepare the synthdef, if the ugens are not installed */
             boost::format frmt("Cannot load synth %1%: Unit generator %2% not installed");
             frmt % name_.c_str() % current_ugen_spec.name.c_str();

server/supernova/sc/sc_ugen_factory.cpp

@@ -143,7 +143,7 @@ sample * sc_bufgen_def::run(World * world, uint32_t buffer_index, struct sc_msg_
     (func)(world, buf, args);
 
     if (data == buf->data)
-        return NULL;
+        return nullptr;
     else
         return data;
 }
@@ -198,7 +198,7 @@ sample * sc_plugin_container::run_bufgen(World * world, const char * name, uint3
     bufgen_set_type::iterator it = bufgen_set.find(name, named_hash_hash(), named_hash_equal());
     if (it == bufgen_set.end()) {
         std::cout << "unable to find buffer generator: " << name << std::endl;
-        return NULL;
+        return nullptr;
     }
 
     return it->run(world, buffer_index, args);
@@ -242,7 +242,7 @@ void sc_ugen_factory::load_plugin ( boost::filesystem::path const & path )
     using namespace std;
 
     void * handle = dlopen(path.string().c_str(), RTLD_NOW | RTLD_LOCAL);
-    if (handle == NULL)
+    if (handle == nullptr)
         return;
 
     typedef int (*info_function)();
@@ -304,7 +304,7 @@ void sc_ugen_factory::load_plugin ( boost::filesystem::path const & path )
         char *s;
         DWORD lastErr = GetLastError();
         FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                       NULL, lastErr , MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char*)&s, 0, NULL );
+                       nullptr, lastErr , MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char*)&s, 0, NULL );
 
         std::cout << "Cannot open plugin: " << path << s << std::endl;
         LocalFree( s );
@@ -336,7 +336,7 @@ void sc_ugen_factory::load_plugin ( boost::filesystem::path const & path )
     if (!ptr) {
         char *s;
         FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                       NULL, GetLastError() , MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char*)&s, 0, NULL );
+                       nullptr, GetLastError() , MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char*)&s, 0, NULL );
 
         std::cout << "*** ERROR: GetProcAddress err " << s << std::endl;
         LocalFree( s );