chore: Rename headers in roc_sndio

Extract device_defs.h and driver_defs.h headers.

Author: gavv

src/internal_modules/roc_pipeline/state_tracker.h

@@ -15,7 +15,7 @@
 #include "roc_core/atomic.h"
 #include "roc_core/noncopyable.h"
 #include "roc_core/stddefs.h"
-#include "roc_sndio/device_state.h"
+#include "roc_sndio/device_defs.h"
 
 namespace roc {
 namespace pipeline {

src/internal_modules/roc_sndio/backend_dispatcher.h

@@ -20,8 +20,8 @@
 #include "roc_core/noncopyable.h"
 #include "roc_core/scoped_ptr.h"
 #include "roc_core/string_list.h"
-#include "roc_sndio/device_type.h"
-#include "roc_sndio/driver.h"
+#include "roc_sndio/device_defs.h"
+#include "roc_sndio/driver_defs.h"
 #include "roc_sndio/ibackend.h"
 #include "roc_sndio/isink.h"
 #include "roc_sndio/isource.h"

src/internal_modules/roc_sndio/backend_map.h

@@ -15,7 +15,7 @@
 #include "roc_core/noncopyable.h"
 #include "roc_core/optional.h"
 #include "roc_core/singleton.h"
-#include "roc_sndio/driver.h"
+#include "roc_sndio/driver_defs.h"
 #include "roc_sndio/ibackend.h"
 
 #ifdef ROC_TARGET_PULSEAUDIO

src/internal_modules/roc_sndio/device_state.cpp renamed to src/internal_modules/roc_sndio/device_defs.cpp

@@ -6,11 +6,23 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "roc_sndio/device_state.h"
+#include "roc_sndio/device_defs.h"
 
 namespace roc {
 namespace sndio {
 
+const char* device_type_to_str(DeviceType type) {
+    switch (type) {
+    case DeviceType_Sink:
+        return "sink";
+
+    case DeviceType_Source:
+        return "source";
+    }
+
+    return "<invalid>";
+}
+
 const char* device_state_to_str(DeviceState state) {
     switch (state) {
     case DeviceState_Active:
@@ -27,9 +39,6 @@ const char* device_state_to_str(DeviceState state) {
 
     case DeviceState_Closed:
         return "closed";
-
-    default:
-        break;
     }
 
     return "<invalid>";

src/internal_modules/roc_sndio/device_state.h renamed to src/internal_modules/roc_sndio/device_defs.h

@@ -6,15 +6,21 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-//! @file roc_sndio/device_state.h
-//! @brief Device state.
+//! @file roc_sndio/device_defs.h
+//! @brief Device definitions.
 
-#ifndef ROC_SNDIO_DEVICE_STATE_H_
-#define ROC_SNDIO_DEVICE_STATE_H_
+#ifndef ROC_SNDIO_DEVICE_DEFS_H_
+#define ROC_SNDIO_DEVICE_DEFS_H_
 
 namespace roc {
 namespace sndio {
 
+//! Device type.
+enum DeviceType {
+    DeviceType_Sink,  //!< Sink.
+    DeviceType_Source //!< Source.
+};
+
 //! Device state.
 enum DeviceState {
     //! Device is running and active.
@@ -38,10 +44,13 @@ enum DeviceState {
     DeviceState_Closed = (1 << 4)
 };
 
+//! Convert device type to string.
+const char* device_type_to_str(DeviceType type);
+
 //! Convert device state to string.
 const char* device_state_to_str(DeviceState state);
 
 } // namespace sndio
 } // namespace roc
 
-#endif // ROC_SNDIO_DEVICE_STATE_H_
+#endif // ROC_SNDIO_DEVICE_DEFS_H_

src/internal_modules/roc_sndio/device_type.cpp

@@ -6,11 +6,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-//! @file roc_sndio/driver.h
-//! @brief Driver information.
+//! @file roc_sndio/driver_defs.h
+//! @brief Driver definitions.
 
-#ifndef ROC_SNDIO_DRIVER_H_
-#define ROC_SNDIO_DRIVER_H_
+#ifndef ROC_SNDIO_DRIVER_DEFS_H_
+#define ROC_SNDIO_DRIVER_DEFS_H_
 
 #include "roc_core/panic.h"
 #include "roc_core/stddefs.h"
@@ -115,4 +115,4 @@ struct FormatInfo {
 } // namespace sndio
 } // namespace roc
 
-#endif // ROC_SNDIO_DRIVER_H_
+#endif // ROC_SNDIO_DRIVER_DEFS_H_

src/internal_modules/roc_sndio/device_type.h

@@ -17,8 +17,8 @@
 #include "roc_core/attributes.h"
 #include "roc_core/iarena.h"
 #include "roc_core/string_list.h"
-#include "roc_sndio/device_type.h"
-#include "roc_sndio/driver.h"
+#include "roc_sndio/device_defs.h"
+#include "roc_sndio/driver_defs.h"
 #include "roc_sndio/idevice.h"
 #include "roc_sndio/io_config.h"
 #include "roc_status/status_code.h"

src/internal_modules/roc_sndio/driver.h renamed to src/internal_modules/roc_sndio/driver_defs.h

@@ -16,8 +16,7 @@
 #include "roc_core/attributes.h"
 #include "roc_core/stddefs.h"
 #include "roc_core/time.h"
-#include "roc_sndio/device_state.h"
-#include "roc_sndio/device_type.h"
+#include "roc_sndio/device_defs.h"
 #include "roc_status/status_code.h"
 
 namespace roc {