Skip to content
Browse files

Minor changes

Renaming Project + file names to reflect the sample's objective.
  • Loading branch information...
1 parent b238ad4 commit 0f76048609ebd2aef91242b889c73b25c03d5b21 Ramprasad Madhavan committed Jul 15, 2012
Showing with 25 additions and 26 deletions.
  1. +2 −2 .gitignore
  2. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/.cproject
  3. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/.project
  4. +1 −1 HelloOpenALOggVorbis/HelloOpenALOggVorbis.pro → HelloOggVorbis/HelloOggVorbis.pro
  5. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/LICENSE
  6. +1 −1 {HelloOpenALOggVorbis → HelloOggVorbis}/Makefile
  7. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/Notice
  8. +3 −2 {HelloOpenALOggVorbis → HelloOggVorbis}/README.md
  9. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/assets/cowbell.qml
  10. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/assets/images/background.png
  11. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/assets/images/bell.png
  12. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/assets/sounds/cowbell.wav
  13. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/assets/sounds/moo.ogg
  14. +2 −2 {HelloOpenALOggVorbis → HelloOggVorbis}/bar-descriptor.xml
  15. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/external-lib/oggvorbis/include/ogg/ogg.h
  16. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/external-lib/oggvorbis/include/ogg/os_types.h
  17. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/external-lib/oggvorbis/include/vorbis/codec.h
  18. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/external-lib/oggvorbis/include/vorbis/vorbisenc.h
  19. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/external-lib/oggvorbis/include/vorbis/vorbisfile.h
  20. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/external-lib/oggvorbis/lib/qnx/arm/libvorbis.a
  21. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/external-lib/oggvorbis/lib/qnx/x86/libvorbis.a
  22. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/icon.png
  23. +4 −4 HelloOpenALOggVorbis/src/cowbellapp.cpp → HelloOggVorbis/src/hellooggvorbis.cpp
  24. +9 −11 HelloOpenALOggVorbis/src/cowbellapp.h → HelloOggVorbis/src/hellooggvorbis.h
  25. +2 −2 {HelloOpenALOggVorbis → HelloOggVorbis}/src/main.cpp
  26. +1 −1 {HelloOpenALOggVorbis → HelloOggVorbis}/src/soundmanager.cpp
  27. 0 {HelloOpenALOggVorbis → HelloOggVorbis}/src/soundmanager.h
View
4 .gitignore
@@ -1,5 +1,5 @@
.metadata/*
*.DS_Store
*.o
-HelloOpenAL/arm/*
-HelloOpenAL/x86/*
+HelloOggVorbis/arm/*
+HelloOggVorbis/x86/*
View
0 HelloOpenALOggVorbis/.cproject → HelloOggVorbis/.cproject
File renamed without changes.
View
0 HelloOpenALOggVorbis/.project → HelloOggVorbis/.project
File renamed without changes.
View
2 ...oOpenALOggVorbis/HelloOpenALOggVorbis.pro → HelloOggVorbis/HelloOggVorbis.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
-TARGET = cowbell
+TARGET = hellooggvorbis
CONFIG += qt warn_on debug_and_release cascades
LIBS += -lOpenAL -lalut -L../external-lib/oggvorbis/lib/qnx/arm/ -L../external-lib/oggvorbis/lib/qnx/x86/ -lvorbis
View
0 HelloOpenALOggVorbis/LICENSE → HelloOggVorbis/LICENSE
File renamed without changes.
View
2 HelloOpenALOggVorbis/Makefile → HelloOggVorbis/Makefile
@@ -1,4 +1,4 @@
-QMAKE_TARGET = HelloOpenALOggVorbis
+QMAKE_TARGET = HelloOggVorbis
QMAKE = $(QNX_HOST)/usr/bin/qmake
TARGET = $(QMAKE_TARGET)
View
0 HelloOpenALOggVorbis/Notice → HelloOggVorbis/Notice
File renamed without changes.
View
5 HelloOpenALOggVorbis/README.md → HelloOggVorbis/README.md
@@ -1,12 +1,13 @@
-Cowbell - Basic sound handling using OpenAL and OggVorbis
+HelloOggVorbis - Basic Ogg file handling using OpenAL and OggVorbis
========================================================================
Sample Description.
This sample is extended from the original cascades cowbell sample at \
https://github.com/blackberry/Cascades-Samples. The objective of this sample
is to serve as a tutorial for setting up OpenAL and OggVorbis SDK to play
-compressed .ogg vorbis sound format.
+compressed .ogg vorbis sound format. The sample also shows how to decode the
+regular .wav files without ALUT.
========================================================================
View
0 HelloOpenALOggVorbis/assets/cowbell.qml → HelloOggVorbis/assets/cowbell.qml
File renamed without changes.
View
0 ...nALOggVorbis/assets/images/background.png → HelloOggVorbis/assets/images/background.png
File renamed without changes
View
0 HelloOpenALOggVorbis/assets/images/bell.png → HelloOggVorbis/assets/images/bell.png
File renamed without changes
View
0 ...OpenALOggVorbis/assets/sounds/cowbell.wav → HelloOggVorbis/assets/sounds/cowbell.wav
File renamed without changes.
View
0 HelloOpenALOggVorbis/assets/sounds/moo.ogg → HelloOggVorbis/assets/sounds/moo.ogg
File renamed without changes.
View
4 HelloOpenALOggVorbis/bar-descriptor.xml → HelloOggVorbis/bar-descriptor.xml
@@ -9,11 +9,11 @@
<!-- A universally unique application identifier. Must be unique across all BlackBerry 10 applications.
Using a reverse DNS-style name as the id is recommended. (Eg. com.example.ExampleApplication.) Required. -->
- <id>com.example.openALOggVorbis</id>
+ <id>com.example.hellooggvorbis</id>
<!-- The name that is displayed in the BlackBerry 10 application installer.
May have multiple values for each language. See samples or xsd schema file. Optional. -->
- <name>HelloOpenALOggVorbis</name>
+ <name>HelloOggVorbis</name>
<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
View
0 .../external-lib/oggvorbis/include/ogg/ogg.h → .../external-lib/oggvorbis/include/ogg/ogg.h
File renamed without changes.
View
0 ...rnal-lib/oggvorbis/include/ogg/os_types.h → ...rnal-lib/oggvorbis/include/ogg/os_types.h
File renamed without changes.
View
0 ...rnal-lib/oggvorbis/include/vorbis/codec.h → ...rnal-lib/oggvorbis/include/vorbis/codec.h
File renamed without changes.
View
0 ...-lib/oggvorbis/include/vorbis/vorbisenc.h → ...-lib/oggvorbis/include/vorbis/vorbisenc.h
File renamed without changes.
View
0 ...lib/oggvorbis/include/vorbis/vorbisfile.h → ...lib/oggvorbis/include/vorbis/vorbisfile.h
File renamed without changes.
View
0 ...nal-lib/oggvorbis/lib/qnx/arm/libvorbis.a → ...nal-lib/oggvorbis/lib/qnx/arm/libvorbis.a
File renamed without changes.
View
0 ...nal-lib/oggvorbis/lib/qnx/x86/libvorbis.a → ...nal-lib/oggvorbis/lib/qnx/x86/libvorbis.a
File renamed without changes.
View
0 HelloOpenALOggVorbis/icon.png → HelloOggVorbis/icon.png
File renamed without changes
View
8 HelloOpenALOggVorbis/src/cowbellapp.cpp → HelloOggVorbis/src/hellooggvorbis.cpp
@@ -12,14 +12,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "cowbellapp.h"
+#include "hellooggvorbis.h"
#include <bb/cascades/Page>
#include <bb/cascades/QmlDocument>
using namespace bb::cascades;
-CowBellApp::CowBellApp()
+HelloOggVorbis::HelloOggVorbis()
{
// Here we create a QMLDocument and load it, we are using build patterns.
QmlDocument *qml = QmlDocument::create().load("cowbell.qml");
@@ -46,13 +46,13 @@ CowBellApp::CowBellApp()
}
}
-CowBellApp::~CowBellApp()
+HelloOggVorbis::~HelloOggVorbis()
{
// Destroy the sound manager.
delete mSoundManager;
}
-void CowBellApp::playSound(const QString &msg)
+void HelloOggVorbis::playSound(const QString &msg)
{
mSoundManager->play(msg);
}
View
20 HelloOpenALOggVorbis/src/cowbellapp.h → HelloOggVorbis/src/hellooggvorbis.h
@@ -14,27 +14,25 @@
*/
-#ifndef COWBELLAPP_H
-#define COWBELLAPP_H
+#ifndef HELLOOGGVORBIS_H
+#define HELLOOGGVORBIS_H
#include <bb/cascades/Application>
#include "soundmanager.h"
/**
- * CowBellApp
+ * Hello OggVorbis App
*
- * This sample illustrates how a simple toy instrument can be built using
- * Cascades. As the user hit a cowbell in different places a sound
- * is triggered with different volumes. A transform rotation is applied to
- * give the illusion of the bell hanging around the neck of a cow.
+ * This sample is a fork of the Cascades Cowbell App and it illustrates how a
+ * to use OpenAL and OggVorbis to load and play compressed audio.
*/
-class CowBellApp: public QObject
+class HelloOggVorbis: public QObject
{
Q_OBJECT
public:
- CowBellApp();
- ~CowBellApp();
+ HelloOggVorbis();
+ ~HelloOggVorbis();
/**
* Invokable function used for triggering sounds from QML.
@@ -50,4 +48,4 @@ Q_OBJECT
};
-#endif // ifndef COWBELLAPP_H
+#endif // ifndef HELLOOGGVORBIS_H
View
4 HelloOpenALOggVorbis/src/main.cpp → HelloOggVorbis/src/main.cpp
@@ -14,7 +14,7 @@
*/
-#include "cowbellapp.h"
+#include "hellooggvorbis.h"
using ::bb::cascades::Application;
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
Application app(argc, argv);
// Our app is initialized.
- CowBellApp mainApp;
+ HelloOggVorbis mainApp;
// We complete the transaction started in the app constructor and start the client event loop here
// when loop is exited the Application deletes the scene which deletes all its children.
View
2 HelloOpenALOggVorbis/src/soundmanager.cpp → HelloOggVorbis/src/soundmanager.cpp
@@ -474,5 +474,5 @@ bool SoundManager::play(QString fileName, float pitch, float gain)
bool SoundManager::play(QString fileName)
{
// Play the sound with default gain and pitch values.
- return play(fileName, 1.0f, 1.0f);
+ return play(fileName, 4.0f, 4.0f);
}
View
0 HelloOpenALOggVorbis/src/soundmanager.h → HelloOggVorbis/src/soundmanager.h
File renamed without changes.

0 comments on commit 0f76048

Please sign in to comment.
Something went wrong with that request. Please try again.