mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

testing and doxy comment audio and screen

Browse Source
This commit is contained in:
qPCR4vir 2015-05-10 15:28:59 +02:00
parent e31616e5dd
commit f4ceafbe6c
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/nana/audio/player.hpp
View File

@ -4,7 +4,10 @@
#include <nana/deploy.hpp> #include <nana/deploy.hpp>
namespace nana{ namespace audio namespace nana{ namespace audio
{ /// play an audio file in Windows WAV format { /// class player
/// \brief play an audio file in PCM Windows WAV format
///
/// \include audio_player.cpp
class player class player
: private nana::noncopyable : private nana::noncopyable
{ {

13
include/nana/gui/screen.hpp
View File

@ -34,27 +34,38 @@ namespace nana
virtual const ::nana::rectangle& workarea() const = 0; virtual const ::nana::rectangle& workarea() const = 0;
}; };
/// Provides some functions to get the metrics of the monitors \include screen.cpp
class screen class screen
{ {
struct implement; struct implement;
public: public:
/// gets the size in pixel of the whole virtual desktop
static ::nana::size desktop_size(); static ::nana::size desktop_size();
/// gets the resolution in pixel of the primary monitor,
/// if there is only one monitor installed in the system,
/// the return value of primary_monitor_size is equal to desktop_size's.
static ::nana::size primary_monitor_size(); static ::nana::size primary_monitor_size();
screen(); screen();
/// Reload has no preconditions, it's safe to call on moved-from /// Reload has no preconditions, it's safe to call on moved-from
void reload(); void reload();
/// Returns the number of display monitors /// Returns the number of display monitors installed in the system
std::size_t count() const; std::size_t count() const;
/// gets the display monitor that contains the specified point
display& from_point(const point&); display& from_point(const point&);
/// gets the display monitor that contains the specified window
display& from_window(window); display& from_window(window);
display& get_display(std::size_t index) const; display& get_display(std::size_t index) const;
display& get_primary() const; display& get_primary() const;
/// applies a given function to all display monitors
void for_each(std::function<void(display&)>) const; void for_each(std::function<void(display&)>) const;
private: private:
std::shared_ptr<implement> impl_; std::shared_ptr<implement> impl_;

3
source/audio/detail/audio_stream.cpp
View File

@ -8,7 +8,8 @@ namespace nana{ namespace audio
//class audio_stream //class audio_stream
bool audio_stream::open(const nana::string& file) bool audio_stream::open(const nana::string& file)
{ {
fs_.open(static_cast<std::string>(nana::charset(file)), std::ios::binary); std::string fname{nana::charset(file)};//static_cast<std::string>()
fs_.open(fname, std::ios::binary);
if(fs_) if(fs_)
{ {
wave_spec::master_riff_chunk riff; wave_spec::master_riff_chunk riff;