Skip to content

output modules #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mchalain wants to merge 10 commits into
base: master
Choose a base branch
from
Open

output modules #210

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
31defd1
transform output_module from table to list
mchalain Jun 23, 2020
8438dbc
move output's version inside the gst.
mchalain Jun 24, 2020
b9481b7
create gmrender_gst library
mchalain Jun 24, 2020
2abf65e
gst module initialize gstreamer if it is necessary
mchalain Jun 24, 2020
63fc541
output may load dynamicly the output library
mchalain Jun 24, 2020
78f7d1e
split the module loading code from the output_init
mchalain Jun 24, 2020
4076762
output may parse the arguments before initialization
mchalain Jun 24, 2020
66e793a
remove dependencies on glib for the module API
mchalain Jun 24, 2020
5a75db4
transform output library to a real module
mchalain Jun 26, 2020
9de0a29
first contribs with mpg123 module
mchalain Jun 26, 2020
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
13 changes: 1 addition & 12 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@

// For version strings of upnp and gstreamer
#include <upnpconfig.h>
#ifdef HAVE_GST
# include <gst/gst.h>
#endif

#include "git-version.h"
#include "logging.h"
Expand Down Expand Up @@ -133,18 +130,10 @@ static GOptionEntry option_entries[] = {

// Fill buffer with version information. Returns pointer to beginning of string.
static const char *GetVersionInfo(char *buffer, size_t len) {
#ifdef HAVE_GST
snprintf(buffer, len, "gmediarender %s "
"(libupnp-%s; glib-%d.%d.%d; gstreamer-%d.%d.%d)",
GM_COMPILE_VERSION, UPNP_VERSION_STRING,
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION,
GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO);
#else
snprintf(buffer, len, "gmediarender %s "
"(libupnp-%s; glib-%d.%d.%d; without gstreamer.)",
"(libupnp-%s; glib-%d.%d.%d)",
GM_COMPILE_VERSION, UPNP_VERSION_STRING,
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
#endif
return buffer;
}

Expand Down
5 changes: 5 additions & 0 deletions src/output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ void output_dump_modules(void)
modules->shortname,
modules->description,
(i==0) ? " (default)" : "");
if (module->version != NULL)
{
char buffer[64];
printf("\tversion: %s\n", module->version(buffer, sizeof(buffer)));
}
i = 1;
module = module->next;
}
Expand Down
10 changes: 10 additions & 0 deletions src/output_gstreamer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,12 +577,22 @@ static int output_gstreamer_init(void)
return 0;
}

static const char *output_gstreamer_version(char *buffer, size_t len)
{
snprintf(buffer, len, "%s (glib-%d.%d.%d; gstreamer-%d.%d.%d)",
Copy link
Owner

@hzeller hzeller Jan 31, 2021

Choose a reason for hiding this comment

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

I think I'd be also fine if the module would return a statically allocated string. We could either have a static allocated buffer and snprintf() into it, or just assemble the stirng with macro tricks.

Providing less headache for the reader of the calling code is a good thing.

Also, it keeps our API interface lean. It is not that we have a heavy lifting function here that requires some external megabyte buffer to be filled, but something that for essentially all known implementation will return a static string in the first place.

PACKAGE_VERSION,
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION,
GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO);
return buffer;
}

struct output_module gstreamer_output = {
.shortname = "gst",
.description = "GStreamer multimedia framework",
.add_options = output_gstreamer_add_options,

.init = output_gstreamer_init,
.version = output_gstreamer_version,
.set_uri = output_gstreamer_set_uri,
.set_next_uri= output_gstreamer_set_next_uri,
.play = output_gstreamer_play,
Expand Down
1 change: 1 addition & 0 deletions src/output_module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ struct output_module {

// Commands.
int (*init)(void);
const char *(*version)(char *buffer, size_t len);
Copy link
Owner

@hzeller hzeller Jan 31, 2021

Choose a reason for hiding this comment

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

(here would be just a simpler const char *(*version)();)

void (*set_uri)(const char *uri, output_update_meta_cb_t meta_info);
void (*set_next_uri)(const char *uri);
int (*play)(output_transition_cb_t transition_callback);
Expand Down