#7 Remove all tabs

Yalir · Sep 17, 2015 · 02cb092 · 02cb092
1 parent 0ad2e84
commit 02cb092
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 65 deletions.
diff --git a/examples/Demo/MediaInfo.cpp b/examples/Demo/MediaInfo.cpp
@@ -69,24 +69,24 @@ void displayMediaInfo(const sfe::Movie& movie)
 
     std::cout << videoStreams.size() + audioStreams.size() + subtitleStreams.size() << " streams found in the media" << std::endl;
 
-	for (const sfe::StreamDescriptor& descriptor : videoStreams)
-		std::cout << " #" << descriptor.identifier << " : " << mediaTypeToString(descriptor.type) << std::endl;
+    for (const sfe::StreamDescriptor& descriptor : videoStreams)
+        std::cout << " #" << descriptor.identifier << " : " << mediaTypeToString(descriptor.type) << std::endl;
 
-	for (const sfe::StreamDescriptor& descriptor : audioStreams)
+    for (const sfe::StreamDescriptor& descriptor : audioStreams)
     {
-		std::cout << " #" << descriptor.identifier << " : " << mediaTypeToString(descriptor.type);
+        std::cout << " #" << descriptor.identifier << " : " << mediaTypeToString(descriptor.type);
 
-		if (!descriptor.language.empty())
-			std::cout << " (language: " << descriptor.language << ")";
+        if (!descriptor.language.empty())
+            std::cout << " (language: " << descriptor.language << ")";
         std::cout << std::endl;
     }
 
-	for (const sfe::StreamDescriptor& descriptor : subtitleStreams)
+    for (const sfe::StreamDescriptor& descriptor : subtitleStreams)
     {
-		std::cout << " #" << descriptor.identifier << " : " << mediaTypeToString(descriptor.type);
+        std::cout << " #" << descriptor.identifier << " : " << mediaTypeToString(descriptor.type);
 
-		if (!descriptor.language.empty())
-			std::cout << " (language: " << descriptor.language << ")";
+        if (!descriptor.language.empty())
+            std::cout << " (language: " << descriptor.language << ")";
         std::cout << std::endl;
     }
 }
diff --git a/examples/Demo/main.cpp b/examples/Demo/main.cpp
@@ -92,11 +92,11 @@ int main(int argc, const char *argv[])
     float height = std::min(static_cast<float>(desktopMode.height), movie.getSize().y);
 
     // For audio files, there is no frame size, set a minimum:
-	if (width * height < 1.f)
-	{
-		width = std::max(width, 250.f);
-		height = std::max(height, 40.f);
-	}
+    if (width * height < 1.f)
+    {
+        width = std::max(width, 250.f);
+        height = std::max(height, 40.f);
+    }
 
     // Create window
     sf::RenderWindow window(sf::VideoMode(width, height), "sfeMovie Player",

diff --git a/examples/MinimalistDemo/main.cpp b/examples/MinimalistDemo/main.cpp
@@ -70,11 +70,11 @@ int main(int argc, const char *argv[])
     float height = std::min(static_cast<float>(desktopMode.height), movie.getSize().y);
 
     // For audio files, there is no frame size, set a minimum:
-	if (width * height < 1.f)
-	{
-		width = std::max(width, 250.f);
-		height = std::max(height, 40.f);
-	}
+    if (width * height < 1.f)
+    {
+        width = std::max(width, 250.f);
+        height = std::max(height, 40.f);
+    }
 
     // Create window
     sf::RenderWindow window(sf::VideoMode(width, height), "sfeMovie Player",

diff --git a/src/Demuxer.cpp b/src/Demuxer.cpp
@@ -446,8 +446,8 @@ namespace sfe
 
         for(std::pair<int, std::shared_ptr<Stream> > pair : streams)
         {
-			pair.second->update();
-		}
+            pair.second->update();
+        }
     }
 
     bool Demuxer::didReachEndOfFile() const

diff --git a/src/MovieImpl.cpp b/src/MovieImpl.cpp
@@ -44,8 +44,8 @@ namespace sfe
 
     MovieImpl::~MovieImpl()
     {
-		if (m_timer && m_timer->getStatus() != Stopped)
-			stop();
+        if (m_timer && m_timer->getStatus() != Stopped)
+            stop();
     }
 
     bool MovieImpl::openFromFile(const std::string& filename)
@@ -245,7 +245,7 @@ namespace sfe
         {
             std::set< std::shared_ptr<Stream> > audioStreams = m_demuxer->getStreamsOfType(Audio);
 
-			for (std::shared_ptr<Stream> stream : audioStreams)
+            for (std::shared_ptr<Stream> stream : audioStreams)
             {
                 std::shared_ptr<AudioStream> audioStream = std::dynamic_pointer_cast<AudioStream>(stream);
                 audioStream->setVolume(volume);
@@ -512,7 +512,7 @@ namespace sfe
                                      m_displayFrame.top + m_displayFrame.height * 0.9f);
         std::list<sf::Vector2i>::const_iterator pos_it = positions.begin();
 
-		for (sf::Sprite& subtitleSprite : m_subtitleSprites)
+        for (sf::Sprite& subtitleSprite : m_subtitleSprites)
         {
             const sf::Vector2u& subSize = subtitleSprite.getTexture()->getSize();
 

diff --git a/src/SubtitleStream.cpp b/src/SubtitleStream.cpp
@@ -66,10 +66,10 @@ namespace sfe
         if((desc->props & AV_CODEC_PROP_BITMAP_SUB) == 0)
         {
 #ifdef SFEMOVIE_ENABLE_ASS_SUBTITLES
-			m_library  = ass_library_init();
+            m_library  = ass_library_init();
             ass_set_message_cb(m_library, ass_log, nullptr);
 
-			m_renderer = ass_renderer_init(m_library);
+            m_renderer = ass_renderer_init(m_library);
             m_track    = ass_new_track(m_library);
 
             ass_set_fonts(m_renderer, NULL, NULL , 1, NULL, 1);
@@ -80,7 +80,7 @@ namespace sfe
 #else
             throw std::runtime_error("Non-bitmap subtitle stream detected but ASS support is disabled. Cannot use stream.");
 #endif
-		}
+        }
     }
 
     SubtitleStream::~SubtitleStream()
@@ -92,17 +92,17 @@ namespace sfe
             m_track = nullptr;
         }
 
-		if(m_renderer)
-		{
-			ass_renderer_done(m_renderer);
-			m_renderer = nullptr;
-		}
-		
-		if(m_library)
-		{
-			ass_library_done(m_library);
-			m_library = nullptr;
-		}
+        if(m_renderer)
+        {
+            ass_renderer_done(m_renderer);
+            m_renderer = nullptr;
+        }
+        
+        if(m_library)
+        {
+            ass_library_done(m_library);
+            m_library = nullptr;
+        }
 #endif
     }
 
@@ -140,9 +140,9 @@ namespace sfe
                 {
                     int changed = 0;
                     ASS_Image* layer = ass_render_frame(m_renderer, m_track,
-                                                      m_timer->getOffset().asMilliseconds(),
-                                                      &changed);
-
+                                                        m_timer->getOffset().asMilliseconds(),
+                                                        &changed);
+                    
                     if (changed)
                     {                     
 
@@ -173,7 +173,7 @@ namespace sfe
                             subtitle->positions.push_back(sf::Vector2i(layer->dst_x, layer->dst_y));
                             subtitle->sprites.push_back(sf::Sprite());
                             subtitle->textures.push_back(sf::Texture());
-
+                            
                             sf::Sprite& sprite = subtitle->sprites.back();
                             sf::Texture& texture = subtitle->textures.back();
 
@@ -340,26 +340,26 @@ namespace sfe
             onGetData();
         }
 
-		std::list< std::shared_ptr<SubtitleData>>::iterator it = m_visibleSubtitles.begin();
-		while (it != m_visibleSubtitles.end()) 
-		{
-			//erase subs that are deleted before the targetPosition
-			if (it->get()->end<targetPosition)
-				it = m_visibleSubtitles.erase(it);
-			else
-				++it;
-		}
-		
-		it = m_pendingSubtitles.begin();
-		while (it != m_pendingSubtitles.end()) 
-		{
-			//erase subs that are deleted before the targetPosition
-			if (it->get()->end<targetPosition)
-				it = m_pendingSubtitles.erase(it);
-			else
-				++it;
-		}
+        std::list< std::shared_ptr<SubtitleData>>::iterator it = m_visibleSubtitles.begin();
+        while (it != m_visibleSubtitles.end()) 
+        {
+            //erase subs that are deleted before the targetPosition
+            if (it->get()->end<targetPosition)
+                it = m_visibleSubtitles.erase(it);
+            else
+                ++it;
+        }
+        
+        it = m_pendingSubtitles.begin();
+        while (it != m_pendingSubtitles.end()) 
+        {
+            //erase subs that are deleted before the targetPosition
+            if (it->get()->end<targetPosition)
+                it = m_pendingSubtitles.erase(it);
+            else
+                ++it;
+        }
 
         return true;
-	}
+    }
 }
diff --git a/src/SubtitleStream.hpp b/src/SubtitleStream.hpp
@@ -145,7 +145,7 @@ namespace sfe
         std::list< std::shared_ptr<SubtitleData> > m_visibleSubtitles;
 
         ASS_Library*    m_library;
-		ASS_Renderer*   m_renderer;
+        ASS_Renderer*   m_renderer;
         ASS_Track*      m_track;
     };