Move "clapper_src" dir to "src"

The "clapper_src" directory name was unusual. This was done to make it work as a widget for other apps. Now that this functionality got removed it can be named simply "src" as recommended by guidelines.
This commit is contained in:
Rafał Dzięgiel
2021-01-21 14:19:04 +01:00
parent 79abc661bc
commit 340cb36ecd
32 changed files with 65 additions and 65 deletions

View File

@@ -14,4 +14,4 @@ Package.init({
libdir: '@libdir@',
datadir: '@datadir@',
});
Package.run(imports.clapper_src.main@ID_POSTFIX@);
Package.run(imports.src.main@ID_POSTFIX@);

View File

@@ -9,4 +9,4 @@ Package.init({
libdir: '@libdir@',
datadir: '@datadir@',
});
Package.run(imports.clapper_src.main);
Package.run(imports.src.main);

View File

@@ -1,6 +0,0 @@
const { Daemon } = imports.clapper_src.daemon;
function main()
{
new Daemon();
}

View File

@@ -19,7 +19,7 @@ subdir('bin')
subdir('data')
installdir = join_paths(get_option('prefix'), 'share', meson.project_name())
install_subdir('clapper_src', install_dir : installdir)
install_subdir('src', install_dir : installdir)
install_subdir('extras', install_dir : installdir)
install_subdir('css', install_dir : installdir)
install_subdir('ui', install_dir : installdir)

View File

@@ -1,8 +1,8 @@
const { Gio, GObject } = imports.gi;
const { AppBase } = imports.clapper_src.appBase;
const { HeaderBar } = imports.clapper_src.headerbar;
const { Widget } = imports.clapper_src.widget;
const Debug = imports.clapper_src.debug;
const { AppBase } = imports.src.appBase;
const { HeaderBar } = imports.src.headerbar;
const { Widget } = imports.src.widget;
const Debug = imports.src.debug;
const { debug } = Debug;

View File

@@ -1,7 +1,7 @@
const { Gio, GLib, GObject, Gtk } = imports.gi;
const Debug = imports.clapper_src.debug;
const Menu = imports.clapper_src.menu;
const Misc = imports.clapper_src.misc;
const Debug = imports.src.debug;
const Menu = imports.src.menu;
const Misc = imports.src.misc;
const { debug } = Debug;
const { settings } = Misc;

View File

@@ -1,7 +1,7 @@
const { GObject } = imports.gi;
const { AppBase } = imports.clapper_src.appBase;
const { HeaderBarBase } = imports.clapper_src.headerbarBase;
const { WidgetRemote } = imports.clapper_src.widgetRemote;
const { AppBase } = imports.src.appBase;
const { HeaderBarBase } = imports.src.headerbarBase;
const { WidgetRemote } = imports.src.widgetRemote;
var AppRemote = GObject.registerClass(
class ClapperAppRemote extends AppBase

View File

@@ -1,8 +1,8 @@
const { GLib, GObject, Gdk, Gtk } = imports.gi;
const Buttons = imports.clapper_src.buttons;
const Debug = imports.clapper_src.debug;
const Misc = imports.clapper_src.misc;
const Revealers = imports.clapper_src.revealers;
const Buttons = imports.src.buttons;
const Debug = imports.src.debug;
const Misc = imports.src.misc;
const Revealers = imports.src.revealers;
const CONTROLS_MARGIN = 2;
const CONTROLS_SPACING = 0;

View File

@@ -1,5 +1,5 @@
const { Gio, GLib, GObject } = imports.gi;
const Debug = imports.clapper_src.debug;
const Debug = imports.src.debug;
const { debug } = Debug;

View File

@@ -1,8 +1,8 @@
const { Gio, GObject, Gtk, Gst } = imports.gi;
const Debug = imports.clapper_src.debug;
const Misc = imports.clapper_src.misc;
const Prefs = imports.clapper_src.prefs;
const PrefsBase = imports.clapper_src.prefsBase;
const Debug = imports.src.debug;
const Misc = imports.src.misc;
const Prefs = imports.src.prefs;
const PrefsBase = imports.src.prefsBase;
const { debug } = Debug;

View File

@@ -1,5 +1,5 @@
const { GObject } = imports.gi;
const { HeaderBarBase } = imports.clapper_src.headerbarBase;
const { HeaderBarBase } = imports.src.headerbarBase;
var HeaderBar = GObject.registerClass(
class ClapperHeaderBar extends HeaderBarBase

View File

@@ -1,5 +1,5 @@
const { GObject, Gtk, Pango } = imports.gi;
const Misc = imports.clapper_src.misc;
const Misc = imports.src.misc;
var HeaderBarBase = GObject.registerClass(
class ClapperHeaderBarBase extends Gtk.HeaderBar

View File

@@ -2,7 +2,7 @@ imports.gi.versions.Gdk = '4.0';
imports.gi.versions.Gtk = '4.0';
const { Gst } = imports.gi;
const { App } = imports.clapper_src.app;
const { App } = imports.src.app;
Gst.init(null);

6
src/mainDaemon.js Normal file
View File

@@ -0,0 +1,6 @@
const { Daemon } = imports.src.daemon;
function main()
{
new Daemon();
}

View File

@@ -1,8 +1,8 @@
imports.gi.versions.Gdk = '4.0';
imports.gi.versions.Gtk = '4.0';
const { AppRemote } = imports.clapper_src.appRemote;
const Misc = imports.clapper_src.misc;
const { AppRemote } = imports.src.appRemote;
const Misc = imports.src.misc;
const ID_POSTFIX = 'Remote';

View File

@@ -1,5 +1,5 @@
const { GObject, Gst, Gtk } = imports.gi;
const Dialogs = imports.clapper_src.dialogs;
const Dialogs = imports.src.dialogs;
var actions = {
openLocal: (window) => new Dialogs.FileChooser(window),

View File

@@ -1,5 +1,5 @@
const { Gio, GstAudio, GstPlayer, Gdk, Gtk } = imports.gi;
const Debug = imports.clapper_src.debug;
const Debug = imports.src.debug;
const { debug } = Debug;

View File

@@ -1,8 +1,8 @@
const { Gdk, Gio, GLib, GObject, Gst, GstPlayer, Gtk } = imports.gi;
const ByteArray = imports.byteArray;
const Debug = imports.clapper_src.debug;
const Misc = imports.clapper_src.misc;
const { PlayerBase } = imports.clapper_src.playerBase;
const Debug = imports.src.debug;
const Misc = imports.src.misc;
const { PlayerBase } = imports.src.playerBase;
const { debug } = Debug;
const { settings } = Misc;

View File

@@ -1,8 +1,8 @@
const { Gio, GLib, GObject, Gst, GstPlayer, Gtk } = imports.gi;
const Debug = imports.clapper_src.debug;
const Misc = imports.clapper_src.misc;
const { PlaylistWidget } = imports.clapper_src.playlist;
const { WebApp } = imports.clapper_src.webApp;
const Debug = imports.src.debug;
const Misc = imports.src.misc;
const { PlaylistWidget } = imports.src.playlist;
const { WebApp } = imports.src.webApp;
const { debug } = Debug;
const { settings } = Misc;
@@ -275,7 +275,7 @@ class ClapperPlayerBase extends GstPlayer.Player
if(!WebServer) {
/* Probably most users will not use this,
* so conditional import for faster startup */
WebServer = imports.clapper_src.webServer.WebServer;
WebServer = imports.src.webServer.WebServer;
}
if(!this.webserver) {

View File

@@ -1,5 +1,5 @@
const { GObject } = imports.gi;
const { WebClient } = imports.clapper_src.webClient;
const { WebClient } = imports.src.webClient;
var PlayerRemote = GObject.registerClass(
class ClapperPlayerRemote extends GObject.Object

View File

@@ -1,6 +1,6 @@
const { GObject, Gst, Gtk, Pango } = imports.gi;
const Misc = imports.clapper_src.misc;
const PrefsBase = imports.clapper_src.prefsBase;
const Misc = imports.src.misc;
const PrefsBase = imports.src.prefsBase;
const { settings } = Misc;

View File

@@ -1,6 +1,6 @@
const { Gio, GObject, Gtk } = imports.gi;
const Debug = imports.clapper_src.debug;
const Misc = imports.clapper_src.misc;
const Debug = imports.src.debug;
const Misc = imports.src.misc;
const { debug } = Debug;
const { settings } = Misc;

View File

@@ -1,5 +1,5 @@
const { GLib, GObject, Gtk, Pango } = imports.gi;
const Debug = imports.clapper_src.debug;
const Debug = imports.src.debug;
const REVEAL_TIME = 800;

View File

@@ -1,6 +1,6 @@
const { Gio, GObject } = imports.gi;
const Debug = imports.clapper_src.debug;
const Misc = imports.clapper_src.misc;
const Debug = imports.src.debug;
const Misc = imports.src.misc;
const { debug } = Debug;

View File

@@ -1,7 +1,7 @@
const { Gio, GObject, Soup } = imports.gi;
const Debug = imports.clapper_src.debug;
const Misc = imports.clapper_src.misc;
const WebHelpers = imports.clapper_src.webHelpers;
const Debug = imports.src.debug;
const Misc = imports.src.misc;
const WebHelpers = imports.src.webHelpers;
const { debug } = Debug;
const { settings } = Misc;

View File

@@ -1,6 +1,6 @@
const { Soup } = imports.gi;
const ByteArray = imports.byteArray;
const Debug = imports.clapper_src.debug;
const Debug = imports.src.debug;
const { debug } = Debug;

View File

@@ -1,6 +1,6 @@
const { Soup, GObject } = imports.gi;
const Debug = imports.clapper_src.debug;
const WebHelpers = imports.clapper_src.webHelpers;
const Debug = imports.src.debug;
const WebHelpers = imports.src.webHelpers;
const { debug } = Debug;

View File

@@ -1,9 +1,9 @@
const { Gdk, GLib, GObject, GstPlayer, Gtk } = imports.gi;
const { Controls } = imports.clapper_src.controls;
const Debug = imports.clapper_src.debug;
const Misc = imports.clapper_src.misc;
const { Player } = imports.clapper_src.player;
const Revealers = imports.clapper_src.revealers;
const { Controls } = imports.src.controls;
const Debug = imports.src.debug;
const Misc = imports.src.misc;
const { Player } = imports.src.player;
const Revealers = imports.src.revealers;
const { debug } = Debug;
const { settings } = Misc;

View File

@@ -1,7 +1,7 @@
const { GObject, Gtk, GstPlayer } = imports.gi;
const Buttons = imports.clapper_src.buttons;
const Misc = imports.clapper_src.misc;
const { PlayerRemote } = imports.clapper_src.playerRemote;
const Buttons = imports.src.buttons;
const Misc = imports.src.misc;
const { PlayerRemote } = imports.src.playerRemote;
var WidgetRemote = GObject.registerClass(
class ClapperWidgetRemote extends Gtk.Grid