diff --git a/.codespell-ignore b/.codespell-ignore new file mode 100644 index 000000000..63c44766d --- /dev/null +++ b/.codespell-ignore @@ -0,0 +1,11 @@ +ba +crasher +datas +hda +hist +hve +inport +nd +mmaped +od +ot diff --git a/INSTALL.md b/INSTALL.md index 8cac21177..7e9c5cf8a 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -48,7 +48,7 @@ This will use the default config file to configure and start the daemon. The default config will also start pipewire-media-session, a default example media session. -You can also enable more debuging with the PIPEWIRE_DEBUG environment +You can also enable more debugging with the PIPEWIRE_DEBUG environment variable like so: ``` diff --git a/NEWS b/NEWS index d7ac0d821..17162ef4b 100644 --- a/NEWS +++ b/NEWS @@ -326,15 +326,15 @@ with previous 0.3.x releases. PipeWire 0.3.0 -The 0.3 release is a major milestone in the developement of +The 0.3 release is a major milestone in the development of PipeWire. It features a complete redesign of the scheduling mechanisms that make it possible to run a JACK compatibility layer with comparable performance to JACK2. The API has been reworked and is declared stable now. All -developement files and runtime paths are versioned so that +development files and runtime paths are versioned so that future incompatible changes can be done without breaking -exising applications. +existing applications. PipeWire 0.3 also includes a (now mandatory) session manager that populates and controls the PipeWire graph. This example @@ -361,7 +361,7 @@ to be somewhat problematic for now. PipeWire 0.2.97 -Eigth pre-release for upcomming 0.3: +Eighth pre-release for upcoming 0.3: - Build fixes - pw-cat improvement: Fix remote name, add midi support @@ -378,7 +378,7 @@ Eigth pre-release for upcomming 0.3: PipeWire 0.2.96 -Seventh pre-release for upcomming 0.3: +Seventh pre-release for upcoming 0.3: - jack: improve compatibility - Fix unit test @@ -394,7 +394,7 @@ Seventh pre-release for upcomming 0.3: PipeWire 0.2.95 -Sixth pre-release for upcomming 0.3: +Sixth pre-release for upcoming 0.3: - Fix tests for big endian some more - Improve v2 compatibility mode: improve type negotiation and @@ -404,7 +404,7 @@ Sixth pre-release for upcomming 0.3: PipeWire 0.2.94 -Fifth pre-release for upcomming 0.3: +Fifth pre-release for upcoming 0.3: - Fix man page names - Fix jack set_sync_timeout @@ -421,7 +421,7 @@ Fifth pre-release for upcomming 0.3: PipeWire 0.2.93 -Fourth pre-release for upcomming 0.3: +Fourth pre-release for upcoming 0.3: - Fix unit tests on 32 bits - Append -pw version to pulse and jack libs. This way we can install @@ -442,7 +442,7 @@ Fourth pre-release for upcomming 0.3: PipeWire 0.2.92 -Third pre-release for upcomming 0.3: +Third pre-release for upcoming 0.3: - Improve old version check some more - Fix unit tests on little/big endian diff --git a/doc/architecture.md b/doc/architecture.md index eb9e10863..ac92a5c13 100644 --- a/doc/architecture.md +++ b/doc/architecture.md @@ -24,7 +24,7 @@ The PipeWire API is, a object oriented asynchronous protocol. All requests and replies are method invocations on some object. Objects are identified with a unique ID. Each object implements an -interface and requestes result in invocations of methods on the +interface and requests result in invocations of methods on the interface. The protocol is message based. A message sent by a client to the @@ -37,7 +37,7 @@ objects or even protocols when required. Messages are encoded with [SPA PODs](spa/pod.md), which make it possible to encode complex objects with right types. -Events from the server can be a reply to a method or can be emited +Events from the server can be a reply to a method or can be emitted when the server state changes. Upon connecting to a server, it will broadcast its state. Clients diff --git a/doc/design.txt b/doc/design.txt index ad9a9c419..7850f061f 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -43,7 +43,7 @@ Protocol The native protocol and object model is similar to wayland but with custom serialization/deserialization of messages. This is because the datastructures -in the messages are more complicated and not easily expressable in xml format. +in the messages are more complicated and not easily expressible in xml format. Extensibility diff --git a/doc/spa/design.md b/doc/spa/design.md index b7d180807..ed5667716 100644 --- a/doc/spa/design.md +++ b/doc/spa/design.md @@ -1,6 +1,6 @@ # SPA Design -SPA (Simple Plugin API) is an extensible API to implement alls kinds of plugins. +SPA (Simple Plugin API) is an extensible API to implement all kinds of plugins. It is inspired by many other plugin APIs, mostly LV2 and GStreamer. Plugins are dynamically loadable objects that contain objects and interfaces that @@ -14,7 +14,7 @@ SPA provides the following functionality: SPA was designed with the following goals in mind: - * No dependencies, SPA is shipped as a set of header files that have no dependecies + * No dependencies, SPA is shipped as a set of header files that have no dependencies except for the standard c library. * Very efficient both in space and in time. * Very configurable and usable in many different environments. All aspects of @@ -210,7 +210,7 @@ When you retrieve an interface from a handle, you get a reference to a small structure that contains the type (string) of the interface, a version and a structure with a set of methods (and data) that are the implementation of the interface. Calling a method on the interface -will just call the apropriate method in the implementation. +will just call the appropriate method in the implementation. Interfaces are defined in a header file (for example see `` for the logger API). It is a self contained diff --git a/doc/spa/pod.md b/doc/spa/pod.md index ac9b3eccc..9ff701101 100644 --- a/doc/spa/pod.md +++ b/doc/spa/pod.md @@ -5,7 +5,7 @@ DBus Variant or LV2 Atom. A POD can express nested structures of Objects (with properties), Vectors, Arrays, sequences and various primitives types. All information in the POD -is layed out sequentially in memory and can be written directly to +is laid out sequentially in memory and can be written directly to storage or exchanged between processes or threads without additional marshalling.. @@ -27,7 +27,7 @@ PODs can contain a number of basic SPA types: * `SPA_TYPE_Bool`: a boolean value * `SPA_TYPE_Id`: an enumerated value * `SPA_TYPE_Int`, `SPA_TYPE_Long`, `SPA_TYPE_Float`, `SPA_TYPE_Double`: - various numerial types, 32 and 64 bits. + various numeral types, 32 and 64 bits. * `SPA_TYPE_String`: a string * `SPA_TYPE_Bytes`: a byte array * `SPA_TYPE_Rectangle`: a rectangle with width and height @@ -196,8 +196,8 @@ pod = spa_pod_builder_pop(&b, &f); ``` As you can see, first push the choice as a Range, then the values. A Range -choice expects at least 3 values, the default value, mininum and maximum -values. There is a shotcut for this as well using varargs: +choice expects at least 3 values, the default value, minimum and maximum +values. There is a shortcut for this as well using varargs: ```c pod = spa_pod_builder_add_object(&b, @@ -299,7 +299,7 @@ below. ## Object Properties -To iterate over the properies in an object you can do: +To iterate over the properties in an object you can do: ```c struct spa_pod_prop *prop; diff --git a/doc/tutorial3.md b/doc/tutorial3.md index 7f2ddbb0d..279bc9b67 100644 --- a/doc/tutorial3.md +++ b/doc/tutorial3.md @@ -87,7 +87,7 @@ asynchronously and the returns value will reflect this. PipeWire uses the return values of the underlying SPA (Simple Plugin API) helper objects (See also [error codes](spa/design.md#error-codes)). -Because all messages on the PipeWire server are handled sequencially, +Because all messages on the PipeWire server are handled sequentially, the sync method will be executed after all previous methods are completed. The PipeWire server will emit a `done` event with the same ID and the return value of the original `pw_core_sync()` diff --git a/doc/tutorial4.md b/doc/tutorial4.md index 4728e74f2..8eb944b5e 100644 --- a/doc/tutorial4.md +++ b/doc/tutorial4.md @@ -156,7 +156,7 @@ and a callback + data. ``` We using `pw_stream_new_simple()` but there is also a `pw_stream_new()` that -takes an exising `struct pw_core` as the first argument and that requires you +takes an existing `struct pw_core` as the first argument and that requires you to add the event handle manually, for more control. The `pw_stream_new_simple()` is, as the name implies, easier to use because it creates a `struct pw_context` and `struct pw_core` automatically. diff --git a/doc/tutorial5.md b/doc/tutorial5.md index c15cc55f0..7c026fd9c 100644 --- a/doc/tutorial5.md +++ b/doc/tutorial5.md @@ -217,7 +217,7 @@ In this example we use the builder to create some `CHOICE` entries for the format properties. We have an enumeration of formats, we need to first give the amount of enumerations -that follow, then the default (prefered) value, followed by alternatives in order +that follow, then the default (preferred) value, followed by alternatives in order of preference: ```c @@ -231,7 +231,7 @@ of preference: SPA_VIDEO_FORMAT_I420), ``` -We also have a `RANGE` of values for the size. We need to give a default (prefered) +We also have a `RANGE` of values for the size. We need to give a default (preferred) size and then a min and max value: ```c diff --git a/doc/tutorial6.md b/doc/tutorial6.md index d42da4f30..72f68b286 100644 --- a/doc/tutorial6.md +++ b/doc/tutorial6.md @@ -134,7 +134,7 @@ automatically serialize the method calls and events between client and server for us. We can now listen for events by adding a listener. We're going to -listen to the info event on the client object that is emited right +listen to the info event on the client object that is emitted right after we bind to it or when it changes. This is not very different from the registry listener we added before: @@ -169,7 +169,7 @@ static void registry_event_global(void *_data, uint32_t id, } ``` -We're also quiting the mainloop after we get the info to nicely stop +We're also quitting the mainloop after we get the info to nicely stop our tutorial application. When we stop the application, don't forget to destroy all proxies that diff --git a/man/pipewire.conf.5.xml.in b/man/pipewire.conf.5.xml.in index 06f7e914e..14c2f582d 100644 --- a/man/pipewire.conf.5.xml.in +++ b/man/pipewire.conf.5.xml.in @@ -33,7 +33,7 @@ This file is part of PipeWire. -
+
diff --git a/pipewire-pulseaudio/src/introspect.c b/pipewire-pulseaudio/src/introspect.c index 6e2469aaa..4c6d5850c 100644 --- a/pipewire-pulseaudio/src/introspect.c +++ b/pipewire-pulseaudio/src/introspect.c @@ -2159,7 +2159,7 @@ pa_operation* pa_context_set_sink_input_volume(pa_context *c, uint32_t idx, cons pa_operation *o; struct stream_volume *d; - pw_log_debug("contex %p: index %d", c, idx); + pw_log_debug("context %p: index %d", c, idx); o = pa_operation_new(c, NULL, do_stream_volume_mute, sizeof(struct stream_volume)); d = o->userdata; d->idx = idx; @@ -2179,7 +2179,7 @@ pa_operation* pa_context_set_sink_input_mute(pa_context *c, uint32_t idx, int mu pa_operation *o; struct stream_volume *d; - pw_log_debug("contex %p: index %d", c, idx); + pw_log_debug("context %p: index %d", c, idx); o = pa_operation_new(c, NULL, do_stream_volume_mute, sizeof(struct stream_volume)); d = o->userdata; d->idx = idx; @@ -2232,7 +2232,7 @@ pa_operation* pa_context_kill_sink_input(pa_context *c, uint32_t idx, pa_context pa_operation *o; struct kill_stream *d; - pw_log_debug("contex %p: index %d", c, idx); + pw_log_debug("context %p: index %d", c, idx); o = pa_operation_new(c, NULL, do_kill_stream, sizeof(struct kill_stream)); d = o->userdata; d->idx = idx; @@ -2461,7 +2461,7 @@ pa_operation* pa_context_set_source_output_volume(pa_context *c, uint32_t idx, c pa_operation *o; struct stream_volume *d; - pw_log_debug("contex %p: index %d", c, idx); + pw_log_debug("context %p: index %d", c, idx); o = pa_operation_new(c, NULL, do_stream_volume_mute, sizeof(struct stream_volume)); d = o->userdata; d->idx = idx; @@ -2481,7 +2481,7 @@ pa_operation* pa_context_set_source_output_mute(pa_context *c, uint32_t idx, int pa_operation *o; struct stream_volume *d; - pw_log_debug("contex %p: index %d", c, idx); + pw_log_debug("context %p: index %d", c, idx); o = pa_operation_new(c, NULL, do_stream_volume_mute, sizeof(struct stream_volume)); d = o->userdata; d->idx = idx; @@ -2500,7 +2500,7 @@ pa_operation* pa_context_kill_source_output(pa_context *c, uint32_t idx, pa_cont pa_operation *o; struct kill_stream *d; - pw_log_debug("contex %p: index %d", c, idx); + pw_log_debug("context %p: index %d", c, idx); o = pa_operation_new(c, NULL, do_kill_stream, sizeof(struct kill_stream)); d = o->userdata; d->idx = idx; diff --git a/pipewire-pulseaudio/src/json.c b/pipewire-pulseaudio/src/json.c index 9ca498bef..8704264b0 100644 --- a/pipewire-pulseaudio/src/json.c +++ b/pipewire-pulseaudio/src/json.c @@ -197,7 +197,7 @@ static const char* parse_string(const char *str, pa_json_object *obj) { goto error; default: - pa_log("Unexepcted escape value: %c", *str); + pa_log("Unexpected escape value: %c", *str); goto error; } } diff --git a/spa/include/spa/buffer/meta.h b/spa/include/spa/buffer/meta.h index e535034c2..0297486f9 100644 --- a/spa/include/spa/buffer/meta.h +++ b/spa/include/spa/buffer/meta.h @@ -71,7 +71,7 @@ struct spa_meta { * timestamps. */ struct spa_meta_header { -#define SPA_META_HEADER_FLAG_DISCONT (1 << 0) /**< data is not continous with previous buffer */ +#define SPA_META_HEADER_FLAG_DISCONT (1 << 0) /**< data is not continuous with previous buffer */ #define SPA_META_HEADER_FLAG_CORRUPTED (1 << 1) /**< data might be corrupted */ #define SPA_META_HEADER_FLAG_MARKER (1 << 2) /**< media specific marker */ #define SPA_META_HEADER_FLAG_HEADER (1 << 3) /**< data contains a codec specific header */ @@ -105,7 +105,7 @@ struct spa_meta_region { * * This metadata contains a bitmap image in the given format and size. * It is typically used for cursor images or other small images that are - * better transfered inline. + * better transferred inline. */ struct spa_meta_bitmap { uint32_t format; /**< bitmap video format, one of enum spa_video_format. 0 is diff --git a/spa/include/spa/monitor/device.h b/spa/include/spa/monitor/device.h index d20470a10..16ad4a1d6 100644 --- a/spa/include/spa/monitor/device.h +++ b/spa/include/spa/monitor/device.h @@ -107,7 +107,7 @@ struct spa_result_device_params { /** * spa_device_events: * - * Events are always emited from the main thread + * Events are always emitted from the main thread */ struct spa_device_events { /** version of the structure */ @@ -194,7 +194,7 @@ struct spa_device_methods { * This function must be called from the main thread. * * \param device a \ref spa_device - * \param seq a sequence numeber to pass to the result function + * \param seq a sequence number to pass to the result function * \param id the param id to enumerate * \param index the index of enumeration, pass 0 for the first item. * \param max the maximum number of items to iterate @@ -255,7 +255,7 @@ struct spa_device_methods { #define SPA_KEY_DEVICE_API "device.api" /**< the api used by the device * Ex. "udev", "alsa", "v4l2". */ #define SPA_KEY_DEVICE_NAME "device.name" /**< the name of the device */ -#define SPA_KEY_DEVICE_ALIAS "device.alias" /**< altenative name of the device */ +#define SPA_KEY_DEVICE_ALIAS "device.alias" /**< alternative name of the device */ #define SPA_KEY_DEVICE_NICK "device.nick" /**< the device short name */ #define SPA_KEY_DEVICE_DESCRIPTION "device.description" /**< a device description */ #define SPA_KEY_DEVICE_ICON "device.icon" /**< icon for the device. A base64 blob diff --git a/spa/include/spa/node/io.h b/spa/include/spa/node/io.h index bddd15a5d..8ea6937de 100644 --- a/spa/include/spa/node/io.h +++ b/spa/include/spa/node/io.h @@ -74,7 +74,7 @@ enum spa_io_type { * the buffer in buffer_id and set the state to * SPA_STATUS_NEED_DATA when new data is requested. * - * If status is SPA_STATUS_STOPPED, some error occured on the + * If status is SPA_STATUS_STOPPED, some error occurred on the * port. * * If status is SPA_STATUS_DRAINED, data from the io area was @@ -137,7 +137,7 @@ struct spa_io_clock { int64_t delay; /**< delay between position and hardware, * positive for capture, negative for playback */ double rate_diff; /**< rate difference between clock and monotonic time */ - uint64_t next_nsec; /**< extimated next wakup time in nanoseconds */ + uint64_t next_nsec; /**< extimated next wakeup time in nanoseconds */ uint32_t padding[8]; }; @@ -235,7 +235,7 @@ struct spa_io_segment { * backwards time reporting. */ uint64_t position; /**< The position when the running time == start. * can be invalid when the owner of the extra segment - * infomation has not yet made the mapping. */ + * information has not yet made the mapping. */ struct spa_io_segment_bar bar; struct spa_io_segment_video video; diff --git a/spa/include/spa/node/node.h b/spa/include/spa/node/node.h index de390e5ca..f9c48e874 100644 --- a/spa/include/spa/node/node.h +++ b/spa/include/spa/node/node.h @@ -146,10 +146,10 @@ struct spa_node_events { #define SPA_VERSION_NODE_EVENTS 0 uint32_t version; /**< version of this structure */ - /** Emited when info changes */ + /** Emitted when info changes */ void (*info) (void *data, const struct spa_node_info *info); - /** Emited when port info changes, NULL when port is removed */ + /** Emitted when port info changes, NULL when port is removed */ void (*port_info) (void *data, enum spa_direction direction, uint32_t port, const struct spa_port_info *info); @@ -175,7 +175,7 @@ struct spa_node_events { /** * \param node a spa_node - * \param event the event that was emited + * \param event the event that was emitted * * This will be called when an out-of-bound event is notified * on \a node. @@ -335,7 +335,7 @@ struct spa_node_methods { * The function will emit the result event up to \a max times with * the result value. The seq in the result will either be the \a seq * number when executed synchronously or the async return value of - * this function when executed asynchrnously. + * this function when executed asynchronously. * * This function must be called from the main thread. * @@ -353,7 +353,7 @@ struct spa_node_methods { * -ENOTSUP when there are no parameters * implemented on \a node * an async return value when the result event will be - * emited later. + * emitted later. */ int (*enum_params) (void *object, int seq, uint32_t id, uint32_t start, uint32_t max, @@ -482,7 +482,7 @@ struct spa_node_methods { * -EINVAL when invalid parameters are given * -ENOENT when \a id is unknown * an async return value when the result event will be - * emited later. + * emitted later. */ int (*port_enum_params) (void *object, int seq, enum spa_direction direction, uint32_t port_id, diff --git a/spa/include/spa/support/dbus.h b/spa/include/spa/support/dbus.h index 6655cf452..ecef81485 100644 --- a/spa/include/spa/support/dbus.h +++ b/spa/include/spa/support/dbus.h @@ -46,7 +46,7 @@ struct spa_dbus_connection { #define SPA_VERSION_DBUS_CONNECTION 0 uint32_t version; /** - * Get the DBusConnection from a wraper + * Get the DBusConnection from a wrapper * * \param conn the spa_dbus_connection wrapper * \return a pointer of type DBusConnection diff --git a/spa/include/spa/support/loop.h b/spa/include/spa/support/loop.h index 5a25ecb7b..575dd2932 100644 --- a/spa/include/spa/support/loop.h +++ b/spa/include/spa/support/loop.h @@ -153,7 +153,7 @@ struct spa_loop_control_methods { /** Enter a loop * \param ctrl the control * - * Start an interation of the loop. This function should be called + * Start an iteration of the loop. This function should be called * before calling iterate and is typically used to capture the thread * that this loop will run in. */ @@ -169,7 +169,7 @@ struct spa_loop_control_methods { /** Perform one iteration of the loop. * \param ctrl the control * \param timeout an optional timeout in milliseconds. - * 0 for no timeout, -1 for infinte timeout. + * 0 for no timeout, -1 for infinite timeout. * * This function will block * up to \a timeout milliseconds and then dispatch the fds with activity. diff --git a/spa/plugins/alsa/acp/acp.h b/spa/plugins/alsa/acp/acp.h index a21f61613..c1df50514 100644 --- a/spa/plugins/alsa/acp/acp.h +++ b/spa/plugins/alsa/acp/acp.h @@ -145,7 +145,7 @@ struct acp_port { uint32_t priority; enum acp_direction direction; enum acp_available available; - char *available_group; /* a string indentifier which determine the group of devices + char *available_group; /* a string identifier which determine the group of devices * handling the available state simultaneously */ enum acp_port_type type; diff --git a/spa/plugins/alsa/acp/alsa-ucm.c b/spa/plugins/alsa/acp/alsa-ucm.c index 74247c423..c10c7392b 100644 --- a/spa/plugins/alsa/acp/alsa-ucm.c +++ b/spa/plugins/alsa/acp/alsa-ucm.c @@ -123,7 +123,7 @@ static struct ucm_items item[] = { {NULL, NULL}, }; -/* UCM verb info - this should eventually be part of policy manangement */ +/* UCM verb info - this should eventually be part of policy management */ static struct ucm_info verb_info[] = { {SND_USE_CASE_VERB_INACTIVE, 0}, {SND_USE_CASE_VERB_HIFI, 8000}, @@ -676,7 +676,7 @@ static char *modifier_name_to_role(const char *mod_name, bool *is_sink) { if (!sub || !*sub) { pa_xfree(sub); - pa_log_warn("Can't match media roles for modifer %s", mod_name); + pa_log_warn("Can't match media roles for modifier %s", mod_name); return NULL; } diff --git a/spa/plugins/alsa/acp/alsa-util.c b/spa/plugins/alsa/acp/alsa-util.c index 3cb356e4f..aea373f79 100644 --- a/spa/plugins/alsa/acp/alsa-util.c +++ b/spa/plugins/alsa/acp/alsa-util.c @@ -254,7 +254,7 @@ int pa_alsa_set_hw_params( (id = snd_pcm_info_get_id(pcm_info))) { /* This horrible hack makes sure we don't disable tsched on USB * devices, which have a low enough transfer size for timer-based - * scheduling to work. This can go away when the ALSA API supprots + * scheduling to work. This can go away when the ALSA API supports * querying the block transfer size. */ if (pa_streq(id, "USB Audio")) is_usb = true; diff --git a/spa/plugins/bluez5/backend-ofono.c b/spa/plugins/bluez5/backend-ofono.c index b03813726..42d7f0e98 100644 --- a/spa/plugins/bluez5/backend-ofono.c +++ b/spa/plugins/bluez5/backend-ofono.c @@ -255,7 +255,7 @@ static DBusHandlerResult ofono_audio_card_found(struct spa_bt_backend *backend, d = spa_bt_device_find_by_address(backend->monitor, remote_address, local_address); if (!d) { - spa_log_error(backend->log, "Device doesnt exist for %s", path); + spa_log_error(backend->log, "Device doesn’t exist for %s", path); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } diff --git a/src/daemon/daemon-config.c b/src/daemon/daemon-config.c index d702a80ff..81cf8a86a 100644 --- a/src/daemon/daemon-config.c +++ b/src/daemon/daemon-config.c @@ -164,7 +164,7 @@ int pw_daemon_config_load_file(struct pw_daemon_config *config, const char *file * @err: Return location for a #GError, or %NULL * * Loads the default config file for PipeWire. The filename can be overridden with - * an evironment variable PIPEWIRE_CONFIG_FILE. + * an environment variable PIPEWIRE_CONFIG_FILE. * * Return: 0 on success, otherwise < 0 and @err is set. */ diff --git a/src/examples/media-session/session-manager.c b/src/examples/media-session/session-manager.c index 18604fa9a..a6ba0ba8e 100644 --- a/src/examples/media-session/session-manager.c +++ b/src/examples/media-session/session-manager.c @@ -106,7 +106,7 @@ static void proxy_client_session_bound(void *data, uint32_t id) info.version = PW_VERSION_SESSION_INFO; info.id = id; - pw_log_debug("got sesssion id:%d", id); + pw_log_debug("got session id:%d", id); pw_client_session_update(impl->session->client_session, PW_CLIENT_SESSION_UPDATE_INFO, diff --git a/src/examples/sdl.h b/src/examples/sdl.h index 9fd3b6aed..fcabe6734 100644 --- a/src/examples/sdl.h +++ b/src/examples/sdl.h @@ -103,7 +103,7 @@ static inline struct spa_pod *sdl_build_formats(SDL_RendererInfo *info, struct s uint32_t i, c; struct spa_pod_frame f[2]; - /* make an oject of type SPA_TYPE_OBJECT_Format and id SPA_PARAM_EnumFormat. + /* make an object of type SPA_TYPE_OBJECT_Format and id SPA_PARAM_EnumFormat. * The object type is important because it defines the properties that are * acceptable. The id gives more context about what the object is meant to * contain. In this case we enumerate supported formats. */ diff --git a/src/extensions/session-manager/interfaces.h b/src/extensions/session-manager/interfaces.h index 292c828b2..5d3422224 100644 --- a/src/extensions/session-manager/interfaces.h +++ b/src/extensions/session-manager/interfaces.h @@ -71,7 +71,7 @@ struct pw_session_events { /** * Notify a session param * - * Event emited as a result of the enum_params method. + * Event emitted as a result of the enum_params method. * * \param seq the sequence number of the request * \param id the param id @@ -115,7 +115,7 @@ struct pw_session_methods { * Enumerate session parameters * * Start enumeration of session parameters. For each param, a - * param event will be emited. + * param event will be emitted. * * \param seq a sequence number returned in the reply * \param id the parameter id to enumerate @@ -173,7 +173,7 @@ struct pw_endpoint_events { /** * Notify a endpoint param * - * Event emited as a result of the enum_params method. + * Event emitted as a result of the enum_params method. * * \param seq the sequence number of the request * \param id the param id @@ -217,7 +217,7 @@ struct pw_endpoint_methods { * Enumerate endpoint parameters * * Start enumeration of endpoint parameters. For each param, a - * param event will be emited. + * param event will be emitted. * * \param seq a sequence number returned in the reply * \param id the parameter id to enumerate @@ -277,7 +277,7 @@ struct pw_endpoint_stream_events { /** * Notify a endpoint stream param * - * Event emited as a result of the enum_params method. + * Event emitted as a result of the enum_params method. * * \param seq the sequence number of the request * \param id the param id @@ -320,7 +320,7 @@ struct pw_endpoint_stream_methods { * Enumerate stream parameters * * Start enumeration of stream parameters. For each param, a - * param event will be emited. + * param event will be emitted. * * \param seq a sequence number returned in the reply * \param id the parameter id to enumerate @@ -377,7 +377,7 @@ struct pw_endpoint_link_events { /** * Notify a endpoint link param * - * Event emited as a result of the enum_params method. + * Event emitted as a result of the enum_params method. * * \param seq the sequence number of the request * \param id the param id @@ -422,7 +422,7 @@ struct pw_endpoint_link_methods { * Enumerate link parameters * * Start enumeration of link parameters. For each param, a - * param event will be emited. + * param event will be emitted. * * \param seq a sequence number returned in the reply * \param id the parameter id to enumerate diff --git a/src/modules/module-metadata/metadata.c b/src/modules/module-metadata/metadata.c index 0b10e7a85..87a0b1ef0 100644 --- a/src/modules/module-metadata/metadata.c +++ b/src/modules/module-metadata/metadata.c @@ -184,7 +184,7 @@ global_bind(void *_data, struct pw_impl_client *client, uint32_t permissions, &data->resource_listener, &resource_events, data); - /* resource methods -> implemention */ + /* resource methods -> implementation */ pw_resource_add_object_listener(resource, &data->object_listener, &metadata_methods, data); diff --git a/src/modules/module-protocol-native/connection.c b/src/modules/module-protocol-native/connection.c index 0a41e68f0..29d48ddfb 100644 --- a/src/modules/module-protocol-native/connection.c +++ b/src/modules/module-protocol-native/connection.c @@ -101,7 +101,7 @@ int pw_protocol_native_connection_get_fd(struct pw_protocol_native_connection *c * * \param conn the connection * \param fd the fd to add - * \return the index of the fd or SPA_IDX_INVALID when an error occured + * \return the index of the fd or SPA_IDX_INVALID when an error occurred * * \memberof pw_protocol_native_connection */ @@ -360,8 +360,8 @@ static int prepare_packet(struct pw_protocol_native_connection *conn, struct buf /** Move to the next packet in the connection * * \param conn the connection - * \param opcode addres of result opcode - * \param dest_id addres of result destination id + * \param opcode address of result opcode + * \param dest_id address of result destination id * \param dt pointer to packet data * \param sz size of packet data * \return true on success diff --git a/src/modules/module-protocol-native/protocol-native.c b/src/modules/module-protocol-native/protocol-native.c index c854c538b..ea50092e5 100644 --- a/src/modules/module-protocol-native/protocol-native.c +++ b/src/modules/module-protocol-native/protocol-native.c @@ -648,7 +648,7 @@ static int core_method_demarshal_destroy(void *object, const struct pw_protocol_ return pw_resource_notify(resource, struct pw_core_methods, destroy, 0, r); no_resource: - pw_log_debug("client %p: unknown resouce %u op:%u", client, id, msg->opcode); + pw_log_debug("client %p: unknown resource %u op:%u", client, id, msg->opcode); pw_resource_errorf(resource, -EINVAL, "unknown resource %d op:%u", id, msg->opcode); return 0; } diff --git a/src/modules/module-protocol-native/v0/interfaces.h b/src/modules/module-protocol-native/v0/interfaces.h index 0625251eb..e9dceff96 100644 --- a/src/modules/module-protocol-native/v0/interfaces.h +++ b/src/modules/module-protocol-native/v0/interfaces.h @@ -74,7 +74,7 @@ extern "C" { * \brief Core methods * * The core global object. This is a singleton object used for - * creating new objects in the remote PipeWire intance. It is + * creating new objects in the remote PipeWire instance. It is * also used for internal features. */ struct pw_core_v0_methods { @@ -194,7 +194,7 @@ struct pw_core_v0_events { /** * Emit a done event * - * The done event is emited as a result of a sync method with the + * The done event is emitted as a result of a sync method with the * same sequence number. * \param seq the sequence number passed to the sync method call */ @@ -320,7 +320,7 @@ struct pw_registry_v0_events { /** * Notify of a global object removal * - * Emited when a global object was removed from the registry. + * Emitted when a global object was removed from the registry. * If the client has any bindings to the global, it should destroy * those. * @@ -371,7 +371,7 @@ struct pw_node_v0_events { /** * Notify a node param * - * Event emited as a result of the enum_params method. + * Event emitted as a result of the enum_params method. * * \param id the param id * \param index the param index @@ -397,7 +397,7 @@ struct pw_node_v0_methods { * Enumerate node parameters * * Start enumeration of node parameters. For each param, a - * param event will be emited. + * param event will be emitted. * * \param id the parameter id to enum or PW_ID_ANY for all * \param start the start index or 0 for the first param @@ -427,7 +427,7 @@ struct pw_port_v0_events { /** * Notify a port param * - * Event emited as a result of the enum_params method. + * Event emitted as a result of the enum_params method. * * \param id the param id * \param index the param index @@ -453,7 +453,7 @@ struct pw_port_v0_methods { * Enumerate port parameters * * Start enumeration of port parameters. For each param, a - * param event will be emited. + * param event will be emitted. * * \param id the parameter id to enumerate * \param start the start index or 0 for the first param diff --git a/src/modules/module-protocol-native/v0/protocol-native.c b/src/modules/module-protocol-native/v0/protocol-native.c index dc0eb59a4..049f1885e 100644 --- a/src/modules/module-protocol-native/v0/protocol-native.c +++ b/src/modules/module-protocol-native/v0/protocol-native.c @@ -746,7 +746,7 @@ static int core_demarshal_destroy(void *object, const struct pw_protocol_native_ return pw_resource_notify(resource, struct pw_core_methods, destroy, 0, r); no_resource: - pw_log_error("client %p: unknown resouce %u op:%u", client, id, msg->opcode); + pw_log_error("client %p: unknown resource %u op:%u", client, id, msg->opcode); pw_resource_errorf(resource, -EINVAL, "unknown resource %d op:%u", id, msg->opcode); return 0; } diff --git a/src/modules/module-session-manager/endpoint-link.c b/src/modules/module-session-manager/endpoint-link.c index bfebe081f..70956ebc9 100644 --- a/src/modules/module-session-manager/endpoint-link.c +++ b/src/modules/module-session-manager/endpoint-link.c @@ -202,7 +202,7 @@ static int global_bind(void *_data, struct pw_impl_client *client, pw_global_add_resource(impl->global, resource); - /* resource methods -> implemention */ + /* resource methods -> implementation */ pw_resource_add_object_listener(resource, &data->object_listener, &link_methods, data); diff --git a/src/modules/module-session-manager/endpoint-stream.c b/src/modules/module-session-manager/endpoint-stream.c index 8e8435d8f..7015668b8 100644 --- a/src/modules/module-session-manager/endpoint-stream.c +++ b/src/modules/module-session-manager/endpoint-stream.c @@ -193,7 +193,7 @@ static int global_bind(void *_data, struct pw_impl_client *client, pw_global_add_resource(impl->global, resource); - /* resource methods -> implemention */ + /* resource methods -> implementation */ pw_resource_add_object_listener(resource, &data->object_listener, &stream_methods, data); diff --git a/src/modules/module-session-manager/endpoint.c b/src/modules/module-session-manager/endpoint.c index 32b97bcb9..18f764481 100644 --- a/src/modules/module-session-manager/endpoint.c +++ b/src/modules/module-session-manager/endpoint.c @@ -202,7 +202,7 @@ static int global_bind(void *_data, struct pw_impl_client *client, pw_global_add_resource(impl->global, resource); - /* resource methods -> implemention */ + /* resource methods -> implementation */ pw_resource_add_object_listener(resource, &data->object_listener, &endpoint_methods, data); diff --git a/src/modules/module-session-manager/session.c b/src/modules/module-session-manager/session.c index 80907bec7..6970e6fec 100644 --- a/src/modules/module-session-manager/session.c +++ b/src/modules/module-session-manager/session.c @@ -193,7 +193,7 @@ static int global_bind(void *_data, struct pw_impl_client *client, pw_global_add_resource(impl->global, resource); - /* resource methods -> implemention */ + /* resource methods -> implementation */ pw_resource_add_object_listener(resource, &data->object_listener, &session_methods, data); diff --git a/src/pipewire/client.h b/src/pipewire/client.h index a55a5c557..ebf4511c4 100644 --- a/src/pipewire/client.h +++ b/src/pipewire/client.h @@ -78,7 +78,7 @@ struct pw_client_events { /** * Notify a client permission * - * Event emited as a result of the get_permissions method. + * Event emitted as a result of the get_permissions method. * * \param default_permissions the default permissions * \param index the index of the first permission entry @@ -126,7 +126,7 @@ struct pw_client_methods { /** * Get client permissions * - * A permissions event will be emited with the permissions. + * A permissions event will be emitted with the permissions. * * \param index the first index to query, 0 for first * \param num the maximum number of items to get diff --git a/src/pipewire/context.h b/src/pipewire/context.h index c3b5273b1..7a2a369b8 100644 --- a/src/pipewire/context.h +++ b/src/pipewire/context.h @@ -92,7 +92,7 @@ struct pw_impl_client; * resources of a PipeWire instance. */ -/** context events emited by the context object added with \ref pw_context_add_listener */ +/** context events emitted by the context object added with \ref pw_context_add_listener */ struct pw_context_events { #define PW_VERSION_CONTEXT_EVENTS 0 uint32_t version; diff --git a/src/pipewire/core.h b/src/pipewire/core.h index 90afd3d6e..1fbaa02bf 100644 --- a/src/pipewire/core.h +++ b/src/pipewire/core.h @@ -109,7 +109,7 @@ struct pw_core_events { /** * Notify new core info * - * This event is emited when first bound to the core or when the + * This event is emitted when first bound to the core or when the * hello method is called. * * \param info new core info @@ -118,7 +118,7 @@ struct pw_core_events { /** * Emit a done event * - * The done event is emited as a result of a sync method with the + * The done event is emitted as a result of a sync method with the * same seq number. * * \param seq the seq number passed to the sync method call @@ -141,7 +141,7 @@ struct pw_core_events { * object. The message is a brief description of the error, * for (debugging) convenience. * - * This event is usually also emited on the proxy object with + * This event is usually also emitted on the proxy object with * \a id. * * \param id object where the error occurred @@ -166,8 +166,8 @@ struct pw_core_events { /** * Notify an object binding * - * This event is emited when a local object ID is bound to a - * global ID. It is emited before the global becomes visible in the + * This event is emitted when a local object ID is bound to a + * global ID. It is emitted before the global becomes visible in the * registry. * * \param id bound object ID @@ -214,7 +214,7 @@ struct pw_core_events { * \brief Core methods * * The core global object. This is a singleton object used for - * creating new objects in the remote PipeWire intance. It is + * creating new objects in the remote PipeWire instance. It is * also used for internal features. */ struct pw_core_methods { @@ -260,7 +260,7 @@ struct pw_core_methods { * object. The message is a brief description of the error, * for (debugging) convenience. * - * This method is usually also emited on the resource object with + * This method is usually also emitted on the resource object with * \a id. * * \param id object where the error occurred @@ -430,7 +430,7 @@ struct pw_registry_events { /** * Notify of a global object removal * - * Emited when a global object was removed from the registry. + * Emitted when a global object was removed from the registry. * If the client has any bindings to the global, it should destroy * those. * diff --git a/src/pipewire/device.h b/src/pipewire/device.h index a3a023ec9..748146027 100644 --- a/src/pipewire/device.h +++ b/src/pipewire/device.h @@ -76,7 +76,7 @@ struct pw_device_events { /** * Notify a device param * - * Event emited as a result of the enum_params method. + * Event emitted as a result of the enum_params method. * * \param seq the sequence number of the request * \param id the param id @@ -120,7 +120,7 @@ struct pw_device_methods { * Enumerate device parameters * * Start enumeration of device parameters. For each param, a - * param event will be emited. + * param event will be emitted. * * \param seq a sequence number to place in the reply * \param id the parameter id to enum or PW_ID_ANY for all diff --git a/src/pipewire/impl-client.h b/src/pipewire/impl-client.h index e10161b25..4e8e1cf2e 100644 --- a/src/pipewire/impl-client.h +++ b/src/pipewire/impl-client.h @@ -84,25 +84,25 @@ struct pw_impl_client_events { #define PW_VERSION_IMPL_CLIENT_EVENTS 0 uint32_t version; - /** emited when the client is destroyed */ + /** emitted when the client is destroyed */ void (*destroy) (void *data); - /** emited right before the client is freed */ + /** emitted right before the client is freed */ void (*free) (void *data); /** the client is initialized */ void (*initialized) (void *data); - /** emited when the client info changed */ + /** emitted when the client info changed */ void (*info_changed) (void *data, const struct pw_client_info *info); - /** emited when a new resource is added for client */ + /** emitted when a new resource is added for client */ void (*resource_added) (void *data, struct pw_resource *resource); - /** emited when a resource is removed */ + /** emitted when a resource is removed */ void (*resource_removed) (void *data, struct pw_resource *resource); - /** emited when the client becomes busy processing an asynchronous + /** emitted when the client becomes busy processing an asynchronous * message. In the busy state no messages should be processed. * Processing should resume when the client becomes not busy */ void (*busy_changed) (void *data, bool busy); diff --git a/src/pipewire/impl-node.h b/src/pipewire/impl-node.h index 21fce9570..63ca87f0c 100644 --- a/src/pipewire/impl-node.h +++ b/src/pipewire/impl-node.h @@ -85,7 +85,7 @@ struct pw_impl_node_events { /** a result was received */ void (*result) (void *data, int seq, int res, uint32_t type, const void *result); - /** an event is emited */ + /** an event is emitted */ void (*event) (void *data, const struct spa_event *event); /** the driver of the node changed */ diff --git a/src/pipewire/main-loop.h b/src/pipewire/main-loop.h index 0ae3079df..b8ffdf90b 100644 --- a/src/pipewire/main-loop.h +++ b/src/pipewire/main-loop.h @@ -45,7 +45,7 @@ struct pw_main_loop_events { #define PW_VERSION_MAIN_LOOP_EVENTS 0 uint32_t version; - /** Emited when the main loop is destroyed */ + /** Emitted when the main loop is destroyed */ void (*destroy) (void *data); }; diff --git a/src/pipewire/mem.h b/src/pipewire/mem.h index 8d809647a..b1751819a 100644 --- a/src/pipewire/mem.h +++ b/src/pipewire/mem.h @@ -48,7 +48,7 @@ enum pw_memmap_flags { PW_MEMMAP_FLAG_NONE = 0, PW_MEMMAP_FLAG_READ = (1 << 0), /**< map in read mode */ PW_MEMMAP_FLAG_WRITE = (1 << 1), /**< map in write mode */ - PW_MEMMAP_FLAG_TWICE = (1 << 2), /**< map the same area twice afer eachother, + PW_MEMMAP_FLAG_TWICE = (1 << 2), /**< map the same area twice after each other, * creating a circular ringbuffer */ PW_MEMMAP_FLAG_PRIVATE = (1 << 3), /**< writes will be private */ PW_MEMMAP_FLAG_READWRITE = PW_MEMMAP_FLAG_READ | PW_MEMMAP_FLAG_WRITE, diff --git a/src/pipewire/node.h b/src/pipewire/node.h index 163659561..f83148df9 100644 --- a/src/pipewire/node.h +++ b/src/pipewire/node.h @@ -103,7 +103,7 @@ struct pw_node_events { /** * Notify a node param * - * Event emited as a result of the enum_params method. + * Event emitted as a result of the enum_params method. * * \param seq the sequence number of the request * \param id the param id @@ -147,7 +147,7 @@ struct pw_node_methods { * Enumerate node parameters * * Start enumeration of node parameters. For each param, a - * param event will be emited. + * param event will be emitted. * * \param seq a sequence number to place in the reply * \param id the parameter id to enum or PW_ID_ANY for all diff --git a/src/pipewire/pipewire.h b/src/pipewire/pipewire.h index d73194a6d..69c523bd6 100644 --- a/src/pipewire/pipewire.h +++ b/src/pipewire/pipewire.h @@ -111,7 +111,7 @@ extern "C" { /** \class pw_pipewire * - * \brief PipeWire initalization and infrasctructure functions + * \brief PipeWire initialization and infrastructure functions */ void pw_init(int *argc, char **argv[]); diff --git a/src/pipewire/port.h b/src/pipewire/port.h index 3a762fc03..03b1386b3 100644 --- a/src/pipewire/port.h +++ b/src/pipewire/port.h @@ -94,7 +94,7 @@ struct pw_port_events { /** * Notify a port param * - * Event emited as a result of the enum_params method. + * Event emitted as a result of the enum_params method. * * \param seq the sequence number of the request * \param id the param id @@ -136,7 +136,7 @@ struct pw_port_methods { * Enumerate port parameters * * Start enumeration of port parameters. For each param, a - * param event will be emited. + * param event will be emitted. * * \param seq a sequence number returned in the reply * \param id the parameter id to enumerate diff --git a/src/pipewire/proxy.c b/src/pipewire/proxy.c index d73797daa..fc47577c4 100644 --- a/src/pipewire/proxy.c +++ b/src/pipewire/proxy.c @@ -252,7 +252,7 @@ void pw_proxy_destroy(struct pw_proxy *proxy) if (!proxy->zombie) { /* mark zombie and emit destroyed. No more - * events will be emited on zombie objects */ + * events will be emitted on zombie objects */ proxy->zombie = true; pw_proxy_emit_destroy(proxy); } diff --git a/src/pipewire/proxy.h b/src/pipewire/proxy.h index 2a9ddf236..c21ea4e71 100644 --- a/src/pipewire/proxy.h +++ b/src/pipewire/proxy.h @@ -120,7 +120,7 @@ struct pw_proxy_events { /** a reply to a sync method completed */ void (*done) (void *data, int seq); - /** an error occured on the proxy */ + /** an error occurred on the proxy */ void (*error) (void *data, int seq, int res, const char *message); }; diff --git a/src/pipewire/resource.h b/src/pipewire/resource.h index 4b2f39cc8..97b3f8d47 100644 --- a/src/pipewire/resource.h +++ b/src/pipewire/resource.h @@ -71,7 +71,7 @@ struct pw_resource_events { /** a reply to a ping event completed */ void (*pong) (void *data, int seq); - /** an error occured on the resource */ + /** an error occurred on the resource */ void (*error) (void *data, int seq, int res, const char *message); }; diff --git a/src/pipewire/stream.h b/src/pipewire/stream.h index 5b2ba03d3..e20db1c47 100644 --- a/src/pipewire/stream.h +++ b/src/pipewire/stream.h @@ -82,7 +82,7 @@ extern "C" { * parameters on the stream. You will be notified of these changes * with the param_changed event. * - * When a format param change is emited, the client should now prepare + * When a format param change is emitted, the client should now prepare * itself to deal with the format and complete the negotiation procedure * with a call to \ref pw_stream_update_params(). * @@ -101,7 +101,7 @@ extern "C" { * that can be used for data transport. You can attach user_data to these * buffers. * - * Afer the buffers are negotiated, the stream will transition to the + * After the buffers are negotiated, the stream will transition to the * \ref PW_STREAM_STATE_PAUSED state. * * \section sec_streaming Streaming @@ -116,7 +116,7 @@ extern "C" { * * \subsection ssec_consume Consume data * - * The process event is emited for each new buffer that can can be + * The process event is emitted for each new buffer that can can be * consumed. * * \ref pw_stream_dequeue_buffer() should be used to get the data and @@ -131,7 +131,7 @@ extern "C" { * * Filled buffers should be queued with \ref pw_stream_queue_buffer(). * - * The process event is emited when PipeWire has emptied a buffer that + * The process event is emitted when PipeWire has emptied a buffer that * can now be refilled. * * \section sec_stream_disconnect Disconnect diff --git a/src/pipewire/work-queue.c b/src/pipewire/work-queue.c index 62b6270a3..694fb50d8 100644 --- a/src/pipewire/work-queue.c +++ b/src/pipewire/work-queue.c @@ -224,7 +224,7 @@ int pw_work_queue_cancel(struct pw_work_queue *queue, void *obj, uint32_t id) } } if (!have_work) { - pw_log_debug(NAME" %p: no defered found for object %p", queue, obj); + pw_log_debug(NAME" %p: no deferred found for object %p", queue, obj); return -EINVAL; } @@ -247,7 +247,7 @@ int pw_work_queue_complete(struct pw_work_queue *queue, void *obj, uint32_t seq, spa_list_for_each(item, &queue->work_list, link) { if (item->obj == obj && item->seq == seq) { - pw_log_debug(NAME" %p: found defered %d for object %p res:%d", + pw_log_debug(NAME" %p: found deferred %d for object %p res:%d", queue, seq, obj, res); item->seq = SPA_ID_INVALID; item->res = res; @@ -255,7 +255,7 @@ int pw_work_queue_complete(struct pw_work_queue *queue, void *obj, uint32_t seq, } } if (!have_work) { - pw_log_trace(NAME" %p: no defered %d found for object %p", queue, seq, obj); + pw_log_trace(NAME" %p: no deferred %d found for object %p", queue, seq, obj); return -EINVAL; } diff --git a/src/tools/midifile.c b/src/tools/midifile.c index df25dc2e7..62cbd0ca0 100644 --- a/src/tools/midifile.c +++ b/src/tools/midifile.c @@ -545,7 +545,7 @@ static const char *program_names[] = { "Celesta", "Glockenspiel", "Music Box", "Vibraphone", "Marimba", "Xylophone", "Tubular Bells", "Dulcimer", "Drawbar Organ", "Percussive Organ", "Rock Organ", "Church Organ", "Reed Organ", "Accoridan", "Harmonica", - "Tango Accordian", "Nylon String Guitar", "Steel String Guitar", + "Tango Accordion", "Nylon String Guitar", "Steel String Guitar", "Electric Jazz Guitar", "Electric Clean Guitar", "Electric Muted Guitar", "Overdriven Guitar", "Distortion Guitar", "Guitar Harmonics", "Acoustic Bass", "Electric Bass (fingered)", "Electric Bass (picked)", diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c index bd9cad176..8549bcf4d 100644 --- a/src/tools/pw-cat.c +++ b/src/tools/pw-cat.c @@ -212,33 +212,33 @@ sf_format_endianess(int format) static inline enum spa_audio_format sf_format_to_pw(int format) { - int endianess; + int endianness; - endianess = sf_format_endianess(format); - if (endianess < 0) + endianness = sf_format_endianess(format); + if (endianness < 0) return SPA_AUDIO_FORMAT_UNKNOWN; switch (format & SF_FORMAT_SUBMASK) { case SF_FORMAT_PCM_S8: return SPA_AUDIO_FORMAT_S8; case SF_FORMAT_PCM_16: - return endianess == 1 ? SPA_AUDIO_FORMAT_S16_LE : - endianess == 2 ? SPA_AUDIO_FORMAT_S16_BE : - SPA_AUDIO_FORMAT_S16; + return endianness == 1 ? SPA_AUDIO_FORMAT_S16_LE : + endianness == 2 ? SPA_AUDIO_FORMAT_S16_BE : + SPA_AUDIO_FORMAT_S16; case SF_FORMAT_PCM_24: case SF_FORMAT_PCM_32: - return endianess == 1 ? SPA_AUDIO_FORMAT_S32_LE : - endianess == 2 ? SPA_AUDIO_FORMAT_S32_BE : - SPA_AUDIO_FORMAT_S32; + return endianness == 1 ? SPA_AUDIO_FORMAT_S32_LE : + endianness == 2 ? SPA_AUDIO_FORMAT_S32_BE : + SPA_AUDIO_FORMAT_S32; case SF_FORMAT_DOUBLE: - return endianess == 1 ? SPA_AUDIO_FORMAT_F64_LE : - endianess == 2 ? SPA_AUDIO_FORMAT_F64_BE : - SPA_AUDIO_FORMAT_F64; + return endianness == 1 ? SPA_AUDIO_FORMAT_F64_LE : + endianness == 2 ? SPA_AUDIO_FORMAT_F64_BE : + SPA_AUDIO_FORMAT_F64; case SF_FORMAT_FLOAT: default: - return endianess == 1 ? SPA_AUDIO_FORMAT_F32_LE : - endianess == 2 ? SPA_AUDIO_FORMAT_F32_BE : - SPA_AUDIO_FORMAT_F32; + return endianness == 1 ? SPA_AUDIO_FORMAT_F32_LE : + endianness == 2 ? SPA_AUDIO_FORMAT_F32_BE : + SPA_AUDIO_FORMAT_F32; break; } @@ -1294,7 +1294,7 @@ int main(int argc, char *argv[]) data.volume = -1.0; data.quality = -1; - /* initialize list everytime */ + /* initialize list every time */ spa_list_init(&data.targets); while ((c = getopt_long(argc, argv, "hvprmR:q:", long_options, NULL)) != -1) { diff --git a/src/tools/pw-dot.c b/src/tools/pw-dot.c index 9a1a12bf5..13f6b5cd0 100644 --- a/src/tools/pw-dot.c +++ b/src/tools/pw-dot.c @@ -496,7 +496,7 @@ static int draw_graph(struct data *d, const char *path) /* open the file */ fp = fopen(path, "w"); if (fp == NULL) { - printf("open error: could not open %s for writting\n", path); + printf("open error: could not open %s for writing\n", path); return -1; }