Skip to content
This repository has been archived by the owner on Jan 21, 2021. It is now read-only.

Commit

Permalink
new name for application: bomi
Browse files Browse the repository at this point in the history
  • Loading branch information
bylee20 committed Jan 14, 2015
1 parent 28e784a commit c374ab0
Show file tree
Hide file tree
Showing 689 changed files with 1,273 additions and 2,010 deletions.
16 changes: 8 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ build/*
arch/pkg
arch/src
arch/*.tar.xz
arch/cmplayer*
arch/bomi*
src/build-interm*
src/libchardet-1.0.2/Makefile
src/libchardet-1.0.2/chardet-config.h
Expand Down Expand Up @@ -56,15 +56,15 @@ src/libchardet-1.0.2/src/nsSBCharSetProber.lo
src/libchardet-1.0.2/src/nsSJISProber.lo
src/libchardet-1.0.2/src/nsUTF8Prober.lo
src/libchardet-1.0.2/src/nsUniversalDetector.lo
src/cmplayer/release
src/cmplayer/debug
src/cmplayer/configure.pro
src/bomi/release
src/bomi/debug
src/bomi/configure.pro
ui_*.h
*.user
src/cmplayer/Makefile
src/cmplayer/Makefile.Debug
src/cmplayer/Makefile.Release
src/cmplayer/cmplayer.pro.user*
src/bomi/Makefile
src/bomi/Makefile.Debug
src/bomi/Makefile.Release
src/bomi/bomi.pro.user*
src/ffmpeg/.config
src/ffmpeg/.version
src/ffmpeg/config.asm
Expand Down
6 changes: 3 additions & 3 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
0.8.2

* Fix: too distorted color in Extended Range
* Fix: cannot open media in some file managers which call cmplayer with url)
* Fix: cannot open media in some file managers which call bomi with url)
* Fix: mute button in skin didn't work
* Fix: workaround to enable libquvi-0.9 (libproxy is always disabled)

Expand Down Expand Up @@ -383,7 +383,7 @@

* New: introduce OSD options in 'Behaviours' tab
* New: '--action=%ID%' command where %ID% can be confirmed in keyboard shortcut option
* New: '--wake-up' command to activate CMPlayer window
* New: '--wake-up' command to activate bomi window
* New: libass support
* Mod: subtitle file list and subtitle track list is unified
* Mod: '--open=%FILE%' command to open a file
Expand Down Expand Up @@ -469,7 +469,7 @@
- Bug fix
* Wrong parsing font color in subtitle
* Crash when open a dialog after playing
* Now CMPlayer ignores the config files of mplayer
* Now bomi ignores the config files of mplayer

0.6.0

Expand Down
90 changes: 45 additions & 45 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ install_dir := sh install_dir.sh
pkg_config_path := @PKG_CONFIG_PATH@

prefix := @prefix@
qmake := @qmake@ DEFINES+=CMPLAYER_RELEASE
qmake := @qmake@ DEFINES+=BOMI_RELEASE
bin_dir := @bindir@
DATADIR := @datadir@
comp_dir := @compdir@
Expand All @@ -20,45 +20,45 @@ qt_sdk := @qtsdk@
macdeployqt := @macdeployqt@

ifeq ($(os),osx)
cmplayer_exec := CMPlayer
cmplayer_exec_dir := build/$(cmplayer_exec).app/Contents/MacOS
bomi_exec := bomi
bomi_exec_dir := build/$(bomi_exec).app/Contents/MacOS
else
cmplayer_exec := cmplayer
cmplayer_exec_dir := build/$(cmplayer_exec)
bomi_exec := bomi
bomi_exec_dir := build/$(bomi_exec)
endif

cmplayer_exec_path := $(cmplayer_exec_dir)/$(cmplayer_exec)
bomi_exec_path := $(bomi_exec_dir)/$(bomi_exec)

cmplayer: build/$(cmplayer_exec_path)
bomi: build/$(bomi_exec_path)

build/$(cmplayer_exec_path): mpv skins imports
cd src/cmplayer && $(qmake) cmplayer.pro && $(MAKE) -j$(njobs) release
build/$(bomi_exec_path): mpv skins imports
cd src/bomi && $(qmake) bomi.pro && $(MAKE) -j$(njobs) release
ifeq ($(os),osx)
cp -r build/skins $(cmplayer_exec_dir)
cp -r build/imports $(cmplayer_exec_dir)
cp -r build/skins $(bomi_exec_dir)
cp -r build/imports $(bomi_exec_dir)
endif

cmplayer-bundle: cmplayer
cp -r $(qt_sdk)/qml/QtQuick.2 $(cmplayer_exec_dir)/imports
install -d $(cmplayer_exec_dir)/imports/QtQuick
cp -r $(qt_sdk)/qml/QtQuick/Controls $(cmplayer_exec_dir)/imports/QtQuick
cp -r $(qt_sdk)/qml/QtQuick/Layouts $(cmplayer_exec_dir)/imports/QtQuick
cp -r /usr/local/Cellar/libquvi/0.4.1/libquvi-scripts/share/libquvi-scripts/lua $(cmplayer_exec_dir)
# rm `find $(cmplayer_exec_dir) -name '*_debug.dylib'`
# cd build && $(macdeployqt) $(cmplayer_exec).app
bomi-bundle: bomi
cp -r $(qt_sdk)/qml/QtQuick.2 $(bomi_exec_dir)/imports
install -d $(bomi_exec_dir)/imports/QtQuick
cp -r $(qt_sdk)/qml/QtQuick/Controls $(bomi_exec_dir)/imports/QtQuick
cp -r $(qt_sdk)/qml/QtQuick/Layouts $(bomi_exec_dir)/imports/QtQuick
cp -r /usr/local/Cellar/libquvi/0.4.1/libquvi-scripts/share/libquvi-scripts/lua $(bomi_exec_dir)
# rm `find $(bomi_exec_dir) -name '*_debug.dylib'`
# cd build && $(macdeployqt) $(bomi_exec).app
# ./fix-dep
cd build && $(macdeployqt) $(cmplayer_exec).app -dmg
cd build && $(macdeployqt) $(bomi_exec).app -dmg

build/lib/libmpv.a: build-mpv
@./build-mpv

mpv: build/lib/libmpv.a

build/skins: build
cp -r src/cmplayer/skins build
cp -r src/bomi/skins build

build/imports: build
cp -r src/cmplayer/imports build
cp -r src/bomi/imports build

skins: build/skins

Expand All @@ -71,15 +71,15 @@ clean:
-cd src/mpv && ./waf uninstall
-cd src/mpv && ./waf clean
-cd src/mpv && ./waf distclean
-cd src/cmplayer && make clean
-cd src/cmplayer && rm -rf Makefile* debug release
-rm -rf build/CMPlayer*
-rm -rf build/cmplayer*
-cd src/bomi && make clean
-cd src/bomi && rm -rf Makefile* debug release
-rm -rf build/bomi*
-rm -rf build/bomi*
-rm -rf build/skins
-rm -rf build/imports
-rm -f cmplayer.1.gz
-rm -f bomi.1.gz

install: cmplayer
install: bomi
ifeq ($(os),linux)
-install -d $(DEST_DIR)$(bin_dir)
-install -d $(DEST_DIR)$(app_dir)
Expand All @@ -97,25 +97,25 @@ ifeq ($(os),linux)
-install -d $(DEST_DIR)$(skin_dir)
-install -d $(DEST_DIR)$(import_dir)
# -install -d $(DEST_DIR)$(icon_dir)/scalable/apps
$(install_exe) build/$(cmplayer_exec) $(DEST_DIR)$(bin_dir)
$(install_file) cmplayer.desktop $(DEST_DIR)$(app_dir)
$(install_file) cmplayer-opendvd.desktop $(DEST_DIR)$(action_dir)
$(install_file) cmplayer.completion $(DEST_DIR)$(comp_dir)/cmplayer
gzip -cf cmplayer.1 > cmplayer.1.gz
$(install_file) cmplayer.1.gz $(DEST_DIR)$(man_dir)/man1/cmplayer.1.gz
$(install_file) icons/cmplayer16.png $(DEST_DIR)$(icon_dir)/16x16/apps/cmplayer.png
$(install_file) icons/cmplayer22.png $(DEST_DIR)$(icon_dir)/22x22/apps/cmplayer.png
$(install_file) icons/cmplayer24.png $(DEST_DIR)$(icon_dir)/24x24/apps/cmplayer.png
$(install_file) icons/cmplayer32.png $(DEST_DIR)$(icon_dir)/32x32/apps/cmplayer.png
$(install_file) icons/cmplayer48.png $(DEST_DIR)$(icon_dir)/48x48/apps/cmplayer.png
$(install_file) icons/cmplayer64.png $(DEST_DIR)$(icon_dir)/64x64/apps/cmplayer.png
$(install_file) icons/cmplayer128.png $(DEST_DIR)$(icon_dir)/128x128/apps/cmplayer.png
$(install_file) icons/cmplayer256.png $(DEST_DIR)$(icon_dir)/256x256/apps/cmplayer.png
# $(install_file) icons/cmplayer.svg $(DEST_DIR)$(icon_dir)/scalable/apps/cmplayer.svg
$(install_exe) build/$(bomi_exec) $(DEST_DIR)$(bin_dir)
$(install_file) bomi.desktop $(DEST_DIR)$(app_dir)
$(install_file) bomi-opendvd.desktop $(DEST_DIR)$(action_dir)
$(install_file) bomi.completion $(DEST_DIR)$(comp_dir)/bomi
gzip -cf bomi.1 > bomi.1.gz
$(install_file) bomi.1.gz $(DEST_DIR)$(man_dir)/man1/bomi.1.gz
$(install_file) icons/bomi16.png $(DEST_DIR)$(icon_dir)/16x16/apps/bomi.png
$(install_file) icons/bomi22.png $(DEST_DIR)$(icon_dir)/22x22/apps/bomi.png
$(install_file) icons/bomi24.png $(DEST_DIR)$(icon_dir)/24x24/apps/bomi.png
$(install_file) icons/bomi32.png $(DEST_DIR)$(icon_dir)/32x32/apps/bomi.png
$(install_file) icons/bomi48.png $(DEST_DIR)$(icon_dir)/48x48/apps/bomi.png
$(install_file) icons/bomi64.png $(DEST_DIR)$(icon_dir)/64x64/apps/bomi.png
$(install_file) icons/bomi128.png $(DEST_DIR)$(icon_dir)/128x128/apps/bomi.png
$(install_file) icons/bomi256.png $(DEST_DIR)$(icon_dir)/256x256/apps/bomi.png
# $(install_file) icons/bomi.svg $(DEST_DIR)$(icon_dir)/scalable/apps/bomi.svg
-cp -r build/skins/* $(DEST_DIR)$(skin_dir)/
-cp -r build/imports/* $(DEST_DIR)$(import_dir)/
else
mv build/$(cmplayer_exec).app $(DEST_DIR)$(prefix)
mv build/$(bomi_exec).app $(DEST_DIR)$(prefix)
endif

.PHONY: cmplayer mpv clean skins imports install
.PHONY: bomi mpv clean skins imports install
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# CMPlayer
# bomi


## Introduction

CMPlayer is a multimedia player.
bomi is a multimedia player.
It is aimed for easy usage but also powerful features.
It provides various features and convenience functions.
Just install and enjoy it!
There will be already what you expect.
If you don't like, you can configure almost everything.

For more details, please visit [CMPlayer Project Page](http://cmplayer.github.io).
For more details, please visit [bomi Project Page](http://bomi.github.io).


## Requirements
Expand Down Expand Up @@ -53,19 +53,19 @@ In such cases, you can build them with in-tree source.
1. Run `./download-libchardet` to download chardet source.
2. Run `./build-libchardet` to build chardet package.

In order to build and install CMPlayer, follow next:
In order to build and install bomi, follow next:

0. If you're trying latest source code from Git repository, run `./init-mpv` first.
1. Run `./configure` with proper options. For details, run `./configure --help`.
2. Run `make` to build CMPlayer
2. Run `make` to build bomi

You can find built executable in `./build` directory.
If you want to install CMPlayer into specified directory by `--prefix` option, run `make install`.
If you want to install bomi into specified directory by `--prefix` option, run `make install`.


## Contacts

### [Issue Tracker](https://github.com/xylosper/cmplayer/issues)
### [Issue Tracker](https://github.com/xylosper/bomi/issues)
If you have problems or want some features, please report them in English, Korean, or Japanese.

### [E-mail](mailto:darklin20@gmail.com)
Expand All @@ -74,7 +74,7 @@ If you want to contact me privately, please send me an e-mail.

## License

CMPlayer is distributed under GPLv2.
bomi is distributed under GPLv2.

Copyright (C) 2014 xylosper

Expand Down
4 changes: 2 additions & 2 deletions arch/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: xylosper <darklin20@gmail.com>
# Contributor: willemw <willemw12@gmail.com>

pkgname=cmplayer
pkgname=bomi
pkgver=0.8.17
pkgrel=1
pkgdesc="Powerful and easy-to-use multimedia player"
Expand All @@ -17,7 +17,7 @@ makedepends=('mesa' 'gcc' 'pkg-config' 'python')
optdepends=('libaacs: AACS decryption for Blu-ray support'
'libbdplus: BD+ decryption for Blu-ray support'
'youtube-dl: streaming website support including YouTube')
source=(https://github.com/xylosper/cmplayer/releases/download/v$pkgver/cmplayer-$pkgver-source.tar.gz)
source=(https://github.com/xylosper/bomi/releases/download/v$pkgver/bomi-$pkgver-source.tar.gz)
md5sums=('7158a294a41832198297ba4d95d3ba97')
options=(debug !strip)

Expand Down
12 changes: 0 additions & 12 deletions arch/cmplayer.install

This file was deleted.

16 changes: 8 additions & 8 deletions arch/make-tarball
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#! /bin/bash

git clone --depth=1 git://github.com/xylosper/cmplayer cmplayer
git clone --depth=1 git://github.com/xylosper/mpv cmplayer/src/mpv
cd cmplayer/src/mpv && python ./bootstrap.py && cd ../../..
git clone --depth=1 git://github.com/xylosper/bomi bomi
git clone --depth=1 git://github.com/xylosper/mpv bomi/src/mpv
cd bomi/src/mpv && python ./bootstrap.py && cd ../../..

rm -rf `find ./cmplayer -name '.git*'`
rm -rf `find ./bomi -name '.git*'`

ver=`head -1 cmplayer/CHANGES.txt`
mv cmplayer cmplayer-$ver
tar cvfz cmplayer-$ver-source.tar.gz cmplayer-$ver
sed -i "s/^md5sums=(.*$/md5sums=('`md5sum cmplayer-$ver-source.tar.gz | sed "s/\s*cmplayer-.*$//"`')/" PKGBUILD
ver=`head -1 bomi/CHANGES.txt`
mv bomi bomi-$ver
tar cvfz bomi-$ver-source.tar.gz bomi-$ver
sed -i "s/^md5sums=(.*$/md5sums=('`md5sum bomi-$ver-source.tar.gz | sed "s/\s*bomi-.*$//"`')/" PKGBUILD
12 changes: 6 additions & 6 deletions cmplayer-opendvd.desktop → bomi-opendvd.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Type=Service
Actions=open;

[Desktop Action open]
Name=Open Video DVD with CMPlayer
Name[pl]=Otwórz Video DVD z CMPlayer
Name[es]=Abrir DVD de vídeo con CMPlayer
Name[de]=Öffne Video-DVD mit CMPlayer
Exec=cmplayer --wake dvd://%d
Icon=cmplayer
Name=Open Video DVD with bomi
Name[pl]=Otwórz Video DVD z bomi
Name[es]=Abrir DVD de vídeo con bomi
Name[de]=Öffne Video-DVD mit bomi
Exec=bomi --wake dvd://%d
Icon=bomi
12 changes: 6 additions & 6 deletions cmplayer.1 → bomi.1
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.\" Manpage for cmplayer.
.\" Manpage for bomi.
.\" Contact breed808@breed808.com to correct errors or typos.
.TH CMPLAYER 1 "10/10/14" "\ \&" "\ \&"
.TH BOMI 1 "10/10/14" "\ \&" "\ \&"
.SH "NAME"
cmplayer \- Play multimedia files
bomi \- Play multimedia files
.SH "SYNOPSIS"
.sp
\fIcmplayer\fR [options] [files\&...]
\fIbomi\fR [options] [files\&...]
.SH "DESCRIPTION"
.sp
CMPlayer is a powerful mediaplayer capable of playing a wide range of audio and video formatsi\&. CMPlayer can play from
bomi is a powerful mediaplayer capable of playing a wide range of audio and video formatsi\&. bomi can play from
sources such as local files, remote URLs, DVDs/CDs and Blu-Ray discs\&.
.SH "OPTIONS"
.PP
Expand All @@ -34,7 +34,7 @@ Set logging verbosity\&. <lv> may be one of the following: fatal, error, warn, i
.PP
\fB\-\-open\fR <file>
.RS 4
Open <file> with cmplayer. <file> may be a local file/path, remote url, or CD/DVD/Blu-Ray\&.
Open <file> with bomi. <file> may be a local file/path, remote url, or CD/DVD/Blu-Ray\&.
.RE
.PP
\fB\-\-opengl\-debug\fR
Expand Down
6 changes: 3 additions & 3 deletions cmplayer.completion → bomi.completion
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# cmplayer completions -*- shell-script -*-
# bomi completions -*- shell-script -*-

_cmplayer()
_bomi()
{
local short_release="-h -v"
local long_completes="--wake --open --action --log-level --opengl-debug \
Expand All @@ -27,4 +27,4 @@ _cmplayer()
return 0
fi
}
complete -F _cmplayer cmplayer
complete -F _bomi bomi
14 changes: 7 additions & 7 deletions cmplayer.desktop → bomi.desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[Desktop Entry]
Name=CMPlayer
Name=bomi
GenericName=Media Player
Comment=Play your media
Name[pl]=CMPlayer
Name[es]=CMPlayer
Name[de]=CMPlayer
Name[pl]=bomi
Name[es]=bomi
Name[de]=bomi
GenericName[pl]=Odtwarzacz filmów
GenericName[es]=Reproductor multimédia
GenericName[de]=Mediaplayer
Comment[pl]=Odtwarzaczaj filmy z CMPlayer
Comment[pl]=Odtwarzaczaj filmy z bomi
Comment[es]=Reproduzca vídeos
Comment[de]=Spielt Medien ab
Exec=cmplayer --wake %u
Icon=cmplayer
Exec=bomi --wake %u
Icon=bomi
StartupNotify=true
Terminal=false
Type=Application
Expand Down
Loading

0 comments on commit c374ab0

Please sign in to comment.